Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A1F818033 for ; Fri, 15 Jan 2016 01:17:51 +0000 (UTC) Received: (qmail 82942 invoked by uid 500); 15 Jan 2016 01:17:51 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 82842 invoked by uid 500); 15 Jan 2016 01:17:51 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 82808 invoked by uid 99); 15 Jan 2016 01:17:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2016 01:17:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84EA0E3884; Fri, 15 Jan 2016 01:17:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gates@apache.org To: commits@hive.apache.org Date: Fri, 15 Jan 2016 01:17:50 -0000 Message-Id: <7d5f42c6ef1a4921a7d6da35f00622af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/22] hive git commit: HIVE-12832 Thrift and RDBMS schema changes for ACID fixes, branch-1 version. Repository: hive Updated Branches: refs/heads/branch-1 67be6771b -> 92072ad24 http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py b/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py index 177531d..978c2a3 100644 --- a/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py +++ b/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -8,6 +8,7 @@ from thrift.Thrift import TType, TMessageType, TException, TApplicationException import hive_metastore.ThriftHiveMetastore +import logging from ttypes import * from thrift.Thrift import TProcessor from thrift.transport import TTransport @@ -116,7 +117,7 @@ class Client(hive_metastore.ThriftHiveMetastore.Client, Iface): return result.success if result.ex is not None: raise result.ex - raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchOne failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchOne failed: unknown result") def fetchN(self, numRows): """ @@ -149,7 +150,7 @@ class Client(hive_metastore.ThriftHiveMetastore.Client, Iface): return result.success if result.ex is not None: raise result.ex - raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchN failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchN failed: unknown result") def fetchAll(self): self.send_fetchAll() @@ -177,7 +178,7 @@ class Client(hive_metastore.ThriftHiveMetastore.Client, Iface): return result.success if result.ex is not None: raise result.ex - raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchAll failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchAll failed: unknown result") def getSchema(self): self.send_getSchema() @@ -205,7 +206,7 @@ class Client(hive_metastore.ThriftHiveMetastore.Client, Iface): return result.success if result.ex is not None: raise result.ex - raise TApplicationException(TApplicationException.MISSING_RESULT, "getSchema failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getSchema failed: unknown result") def getThriftSchema(self): self.send_getThriftSchema() @@ -233,7 +234,7 @@ class Client(hive_metastore.ThriftHiveMetastore.Client, Iface): return result.success if result.ex is not None: raise result.ex - raise TApplicationException(TApplicationException.MISSING_RESULT, "getThriftSchema failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getThriftSchema failed: unknown result") def getClusterStatus(self): self.send_getClusterStatus() @@ -261,7 +262,7 @@ class Client(hive_metastore.ThriftHiveMetastore.Client, Iface): return result.success if result.ex is not None: raise result.ex - raise TApplicationException(TApplicationException.MISSING_RESULT, "getClusterStatus failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getClusterStatus failed: unknown result") def getQueryPlan(self): self.send_getQueryPlan() @@ -289,7 +290,7 @@ class Client(hive_metastore.ThriftHiveMetastore.Client, Iface): return result.success if result.ex is not None: raise result.ex - raise TApplicationException(TApplicationException.MISSING_RESULT, "getQueryPlan failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getQueryPlan failed: unknown result") def clean(self): self.send_clean() @@ -351,9 +352,17 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) result = execute_result() try: self._handler.execute(args.query) - except HiveServerException, ex: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except HiveServerException as ex: + msg_type = TMessageType.REPLY result.ex = ex - oprot.writeMessageBegin("execute", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("execute", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -365,9 +374,17 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) result = fetchOne_result() try: result.success = self._handler.fetchOne() - except HiveServerException, ex: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except HiveServerException as ex: + msg_type = TMessageType.REPLY result.ex = ex - oprot.writeMessageBegin("fetchOne", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("fetchOne", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -379,9 +396,17 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) result = fetchN_result() try: result.success = self._handler.fetchN(args.numRows) - except HiveServerException, ex: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except HiveServerException as ex: + msg_type = TMessageType.REPLY result.ex = ex - oprot.writeMessageBegin("fetchN", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("fetchN", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -393,9 +418,17 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) result = fetchAll_result() try: result.success = self._handler.fetchAll() - except HiveServerException, ex: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except HiveServerException as ex: + msg_type = TMessageType.REPLY result.ex = ex - oprot.writeMessageBegin("fetchAll", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("fetchAll", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -407,9 +440,17 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) result = getSchema_result() try: result.success = self._handler.getSchema() - except HiveServerException, ex: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except HiveServerException as ex: + msg_type = TMessageType.REPLY result.ex = ex - oprot.writeMessageBegin("getSchema", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("getSchema", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -421,9 +462,17 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) result = getThriftSchema_result() try: result.success = self._handler.getThriftSchema() - except HiveServerException, ex: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except HiveServerException as ex: + msg_type = TMessageType.REPLY result.ex = ex - oprot.writeMessageBegin("getThriftSchema", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("getThriftSchema", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -435,9 +484,17 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) result = getClusterStatus_result() try: result.success = self._handler.getClusterStatus() - except HiveServerException, ex: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except HiveServerException as ex: + msg_type = TMessageType.REPLY result.ex = ex - oprot.writeMessageBegin("getClusterStatus", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("getClusterStatus", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -449,9 +506,17 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) result = getQueryPlan_result() try: result.success = self._handler.getQueryPlan() - except HiveServerException, ex: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except HiveServerException as ex: + msg_type = TMessageType.REPLY result.ex = ex - oprot.writeMessageBegin("getQueryPlan", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("getQueryPlan", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -461,8 +526,16 @@ class Processor(hive_metastore.ThriftHiveMetastore.Processor, Iface, TProcessor) args.read(iprot) iprot.readMessageEnd() result = clean_result() - self._handler.clean() - oprot.writeMessageBegin("clean", TMessageType.REPLY, seqid) + try: + self._handler.clean() + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("clean", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -495,7 +568,7 @@ class execute_args: break if fid == 1: if ftype == TType.STRING: - self.query = iprot.readString(); + self.query = iprot.readString() else: iprot.skip(ftype) else: @@ -674,7 +747,7 @@ class fetchOne_result: break if fid == 0: if ftype == TType.STRING: - self.success = iprot.readString(); + self.success = iprot.readString() else: iprot.skip(ftype) elif fid == 1: @@ -750,7 +823,7 @@ class fetchN_args: break if fid == 1: if ftype == TType.I32: - self.numRows = iprot.readI32(); + self.numRows = iprot.readI32() else: iprot.skip(ftype) else: @@ -820,7 +893,7 @@ class fetchN_result: self.success = [] (_etype3, _size0) = iprot.readListBegin() for _i4 in xrange(_size0): - _elem5 = iprot.readString(); + _elem5 = iprot.readString() self.success.append(_elem5) iprot.readListEnd() else: @@ -952,7 +1025,7 @@ class fetchAll_result: self.success = [] (_etype10, _size7) = iprot.readListBegin() for _i11 in xrange(_size7): - _elem12 = iprot.readString(); + _elem12 = iprot.readString() self.success.append(_elem12) iprot.readListEnd() else: http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-py/hive_service/constants.py ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-py/hive_service/constants.py b/service/src/gen/thrift/gen-py/hive_service/constants.py index 99717a9..4a6492b 100644 --- a/service/src/gen/thrift/gen-py/hive_service/constants.py +++ b/service/src/gen/thrift/gen-py/hive_service/constants.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-py/hive_service/ttypes.py ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-py/hive_service/ttypes.py b/service/src/gen/thrift/gen-py/hive_service/ttypes.py index 29eb916..e19fe2a 100644 --- a/service/src/gen/thrift/gen-py/hive_service/ttypes.py +++ b/service/src/gen/thrift/gen-py/hive_service/ttypes.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -75,32 +75,32 @@ class HiveClusterStatus: break if fid == 1: if ftype == TType.I32: - self.taskTrackers = iprot.readI32(); + self.taskTrackers = iprot.readI32() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.I32: - self.mapTasks = iprot.readI32(); + self.mapTasks = iprot.readI32() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.I32: - self.reduceTasks = iprot.readI32(); + self.reduceTasks = iprot.readI32() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.I32: - self.maxMapTasks = iprot.readI32(); + self.maxMapTasks = iprot.readI32() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.I32: - self.maxReduceTasks = iprot.readI32(); + self.maxReduceTasks = iprot.readI32() else: iprot.skip(ftype) elif fid == 6: if ftype == TType.I32: - self.state = iprot.readI32(); + self.state = iprot.readI32() else: iprot.skip(ftype) else: @@ -196,17 +196,17 @@ class HiveServerException(TException): break if fid == 1: if ftype == TType.STRING: - self.message = iprot.readString(); + self.message = iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.I32: - self.errorCode = iprot.readI32(); + self.errorCode = iprot.readI32() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.SQLState = iprot.readString(); + self.SQLState = iprot.readString() else: iprot.skip(ftype) else: http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-rb/hive_service_constants.rb ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-rb/hive_service_constants.rb b/service/src/gen/thrift/gen-rb/hive_service_constants.rb index 73f4d7b..ed7d2d7 100644 --- a/service/src/gen/thrift/gen-rb/hive_service_constants.rb +++ b/service/src/gen/thrift/gen-rb/hive_service_constants.rb @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-rb/hive_service_types.rb ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-rb/hive_service_types.rb b/service/src/gen/thrift/gen-rb/hive_service_types.rb index f97a6fb..9191767 100644 --- a/service/src/gen/thrift/gen-rb/hive_service_types.rb +++ b/service/src/gen/thrift/gen-rb/hive_service_types.rb @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-rb/t_c_l_i_service.rb ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-rb/t_c_l_i_service.rb b/service/src/gen/thrift/gen-rb/t_c_l_i_service.rb index f754d7d..7d7f7a7 100644 --- a/service/src/gen/thrift/gen-rb/t_c_l_i_service.rb +++ b/service/src/gen/thrift/gen-rb/t_c_l_i_service.rb @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb b/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb index 3f72769..25adbb4 100644 --- a/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb +++ b/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb b/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb index bfb2b69..f004ec4 100644 --- a/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb +++ b/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # http://git-wip-us.apache.org/repos/asf/hive/blob/92072ad2/service/src/gen/thrift/gen-rb/thrift_hive.rb ---------------------------------------------------------------------- diff --git a/service/src/gen/thrift/gen-rb/thrift_hive.rb b/service/src/gen/thrift/gen-rb/thrift_hive.rb index 6859ceb..2b57cd9 100644 --- a/service/src/gen/thrift/gen-rb/thrift_hive.rb +++ b/service/src/gen/thrift/gen-rb/thrift_hive.rb @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.2) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING #