ZEPPELIN-5249: Update to thrift 0.14.1

Change-Id: I91181caf2401d5493be61be06cfd4b82a55e2de9
apache · Apr 20, 2021 · 94b6762 · 94b6762
1 parent 0afe2e2
commit 94b6762
Show file tree

Hide file tree

Showing 27 changed files with 291 additions and 516 deletions.
diff --git a/pom.xml b/pom.xml
@@ -123,7 +123,7 @@
     <!-- common library versions -->
     <slf4j.version>1.7.30</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
-    <libthrift.version>0.13.0</libthrift.version>
+    <libthrift.version>0.14.1</libthrift.version>
     <gson.version>2.8.6</gson.version>
     <gson-extras.version>0.2.2</gson-extras.version>
     <jetty.version>9.4.31.v20200723</jetty.version>

diff --git a/...er/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java b/...er/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
@@ -65,8 +65,9 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector,
 
   public RemoteInterpreterEventClient(String intpEventHost, int intpEventPort, int connectionPoolSize) {
     this.remoteClient = new PooledRemoteClient<>(() -> {
-      TSocket transport = new TSocket(intpEventHost, intpEventPort);
+      TSocket transport;
       try {
+        transport = new TSocket(intpEventHost, intpEventPort);
         transport.open();
       } catch (TTransportException e) {
         throw new IOException(e);

diff --git a/...rpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/...rpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -315,13 +315,6 @@ public static void main(String[] args) throws Exception {
 
     remoteInterpreterServer.join();
     LOGGER.info("RemoteInterpreterServer thread is finished");
-
-    /* TODO(pdallig): Remove System.exit(0) if the thrift server can be shut down successfully.
-     * https://github.com/apache/thrift/commit/9cb1c794cd39cfb276771f8e52f0306eb8d462fd
-     * should be part of the next release and solve the problem.
-     * We may have other threads that are not terminated successfully.
-     */
-    System.exit(0);
   }
 
   // Submit interpreter process metadata information to cluster metadata

diff --git a/...lin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/AngularObjectId.java b/...lin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/AngularObjectId.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.14.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.zeppelin.interpreter.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2021-03-09")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.14.1)", date = "2021-04-20")
 public class AngularObjectId implements org.apache.thrift.TBase<AngularObjectId, AngularObjectId._Fields>, java.io.Serializable, Cloneable, Comparable<AngularObjectId> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AngularObjectId");
 
@@ -298,8 +298,6 @@ public boolean isSet(_Fields field) {
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof AngularObjectId)
       return this.equals((AngularObjectId)that);
     return false;
@@ -368,7 +366,7 @@ public int compareTo(AngularObjectId other) {
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetNoteId()).compareTo(other.isSetNoteId());
+    lastComparison = java.lang.Boolean.compare(isSetNoteId(), other.isSetNoteId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -378,7 +376,7 @@ public int compareTo(AngularObjectId other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetParagraphId()).compareTo(other.isSetParagraphId());
+    lastComparison = java.lang.Boolean.compare(isSetParagraphId(), other.isSetParagraphId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -388,7 +386,7 @@ public int compareTo(AngularObjectId other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = java.lang.Boolean.compare(isSetName(), other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }

diff --git a/...nterpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/AppOutputAppendEvent.java b/...nterpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/AppOutputAppendEvent.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.14.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.zeppelin.interpreter.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2021-03-09")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.14.1)", date = "2021-04-20")
 public class AppOutputAppendEvent implements org.apache.thrift.TBase<AppOutputAppendEvent, AppOutputAppendEvent._Fields>, java.io.Serializable, Cloneable, Comparable<AppOutputAppendEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AppOutputAppendEvent");
 
@@ -401,8 +401,6 @@ public boolean isSet(_Fields field) {
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof AppOutputAppendEvent)
       return this.equals((AppOutputAppendEvent)that);
     return false;
@@ -495,7 +493,7 @@ public int compareTo(AppOutputAppendEvent other) {
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetNoteId()).compareTo(other.isSetNoteId());
+    lastComparison = java.lang.Boolean.compare(isSetNoteId(), other.isSetNoteId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -505,7 +503,7 @@ public int compareTo(AppOutputAppendEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetParagraphId()).compareTo(other.isSetParagraphId());
+    lastComparison = java.lang.Boolean.compare(isSetParagraphId(), other.isSetParagraphId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -515,7 +513,7 @@ public int compareTo(AppOutputAppendEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetAppId()).compareTo(other.isSetAppId());
+    lastComparison = java.lang.Boolean.compare(isSetAppId(), other.isSetAppId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -525,7 +523,7 @@ public int compareTo(AppOutputAppendEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIndex()).compareTo(other.isSetIndex());
+    lastComparison = java.lang.Boolean.compare(isSetIndex(), other.isSetIndex());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -535,7 +533,7 @@ public int compareTo(AppOutputAppendEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetData()).compareTo(other.isSetData());
+    lastComparison = java.lang.Boolean.compare(isSetData(), other.isSetData());
     if (lastComparison != 0) {
       return lastComparison;
     }

diff --git a/...nterpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/AppOutputUpdateEvent.java b/...nterpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/AppOutputUpdateEvent.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.14.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.zeppelin.interpreter.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2021-03-09")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.14.1)", date = "2021-04-20")
 public class AppOutputUpdateEvent implements org.apache.thrift.TBase<AppOutputUpdateEvent, AppOutputUpdateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<AppOutputUpdateEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AppOutputUpdateEvent");
 
@@ -452,8 +452,6 @@ public boolean isSet(_Fields field) {
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof AppOutputUpdateEvent)
       return this.equals((AppOutputUpdateEvent)that);
     return false;
@@ -559,7 +557,7 @@ public int compareTo(AppOutputUpdateEvent other) {
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetNoteId()).compareTo(other.isSetNoteId());
+    lastComparison = java.lang.Boolean.compare(isSetNoteId(), other.isSetNoteId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -569,7 +567,7 @@ public int compareTo(AppOutputUpdateEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetParagraphId()).compareTo(other.isSetParagraphId());
+    lastComparison = java.lang.Boolean.compare(isSetParagraphId(), other.isSetParagraphId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -579,7 +577,7 @@ public int compareTo(AppOutputUpdateEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetAppId()).compareTo(other.isSetAppId());
+    lastComparison = java.lang.Boolean.compare(isSetAppId(), other.isSetAppId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -589,7 +587,7 @@ public int compareTo(AppOutputUpdateEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIndex()).compareTo(other.isSetIndex());
+    lastComparison = java.lang.Boolean.compare(isSetIndex(), other.isSetIndex());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -599,7 +597,7 @@ public int compareTo(AppOutputUpdateEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.compare(isSetType(), other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -609,7 +607,7 @@ public int compareTo(AppOutputUpdateEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetData()).compareTo(other.isSetData());
+    lastComparison = java.lang.Boolean.compare(isSetData(), other.isSetData());
     if (lastComparison != 0) {
       return lastComparison;
     }

diff --git a/...nterpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/AppStatusUpdateEvent.java b/...nterpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/AppStatusUpdateEvent.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.14.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.zeppelin.interpreter.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2021-03-09")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.14.1)", date = "2021-04-20")
 public class AppStatusUpdateEvent implements org.apache.thrift.TBase<AppStatusUpdateEvent, AppStatusUpdateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<AppStatusUpdateEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AppStatusUpdateEvent");
 
@@ -349,8 +349,6 @@ public boolean isSet(_Fields field) {
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof AppStatusUpdateEvent)
       return this.equals((AppStatusUpdateEvent)that);
     return false;
@@ -432,7 +430,7 @@ public int compareTo(AppStatusUpdateEvent other) {
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetNoteId()).compareTo(other.isSetNoteId());
+    lastComparison = java.lang.Boolean.compare(isSetNoteId(), other.isSetNoteId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -442,7 +440,7 @@ public int compareTo(AppStatusUpdateEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetParagraphId()).compareTo(other.isSetParagraphId());
+    lastComparison = java.lang.Boolean.compare(isSetParagraphId(), other.isSetParagraphId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -452,7 +450,7 @@ public int compareTo(AppStatusUpdateEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetAppId()).compareTo(other.isSetAppId());
+    lastComparison = java.lang.Boolean.compare(isSetAppId(), other.isSetAppId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -462,7 +460,7 @@ public int compareTo(AppStatusUpdateEvent other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+    lastComparison = java.lang.Boolean.compare(isSetStatus(), other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }

diff --git a/...terpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/InterpreterCompletion.java b/...terpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/InterpreterCompletion.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.14.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.zeppelin.interpreter.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2021-03-09")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.14.1)", date = "2021-04-20")
 public class InterpreterCompletion implements org.apache.thrift.TBase<InterpreterCompletion, InterpreterCompletion._Fields>, java.io.Serializable, Cloneable, Comparable<InterpreterCompletion> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InterpreterCompletion");
 
@@ -298,8 +298,6 @@ public boolean isSet(_Fields field) {
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof InterpreterCompletion)
       return this.equals((InterpreterCompletion)that);
     return false;
@@ -368,7 +366,7 @@ public int compareTo(InterpreterCompletion other) {
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = java.lang.Boolean.compare(isSetName(), other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -378,7 +376,7 @@ public int compareTo(InterpreterCompletion other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -388,7 +386,7 @@ public int compareTo(InterpreterCompletion other) {
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetMeta()).compareTo(other.isSetMeta());
+    lastComparison = java.lang.Boolean.compare(isSetMeta(), other.isSetMeta());
     if (lastComparison != 0) {
       return lastComparison;
     }

diff --git a/...rpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/InterpreterRPCException.java b/...rpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/InterpreterRPCException.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.14.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.zeppelin.interpreter.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)", date = "2021-03-09")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.14.1)", date = "2021-04-20")
 public class InterpreterRPCException extends org.apache.thrift.TException implements org.apache.thrift.TBase<InterpreterRPCException, InterpreterRPCException._Fields>, java.io.Serializable, Cloneable, Comparable<InterpreterRPCException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InterpreterRPCException");
 
@@ -196,8 +196,6 @@ public boolean isSet(_Fields field) {
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof InterpreterRPCException)
       return this.equals((InterpreterRPCException)that);
     return false;
@@ -240,7 +238,7 @@ public int compareTo(InterpreterRPCException other) {
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetErrorMessage()).compareTo(other.isSetErrorMessage());
+    lastComparison = java.lang.Boolean.compare(isSetErrorMessage(), other.isSetErrorMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }