Pārlūkot izejas kodu

HUE-8737 [core] Futurize apps/impala for Python 3.5

Ying Chen 6 gadi atpakaļ
vecāks
revīzija
a621b5d94f
29 mainītis faili ar 420 papildinājumiem un 380 dzēšanām
  1. 2 1
      apps/impala/gen-py/ErrorCodes/constants.py
  2. 1 0
      apps/impala/gen-py/ErrorCodes/ttypes.py
  3. 2 1
      apps/impala/gen-py/ExecStats/constants.py
  4. 12 10
      apps/impala/gen-py/ExecStats/ttypes.py
  5. 7 5
      apps/impala/gen-py/ImpalaService/ImpalaHiveServer2Service.py
  6. 17 15
      apps/impala/gen-py/ImpalaService/ImpalaService.py
  7. 2 1
      apps/impala/gen-py/ImpalaService/constants.py
  8. 11 9
      apps/impala/gen-py/ImpalaService/ttypes.py
  9. 2 1
      apps/impala/gen-py/Status/constants.py
  10. 4 2
      apps/impala/gen-py/Status/ttypes.py
  11. 2 1
      apps/impala/gen-py/Types/constants.py
  12. 15 13
      apps/impala/gen-py/Types/ttypes.py
  13. 29 26
      apps/impala/gen-py/beeswaxd/BeeswaxService.py
  14. 2 1
      apps/impala/gen-py/beeswaxd/constants.py
  15. 13 11
      apps/impala/gen-py/beeswaxd/ttypes.py
  16. 32 29
      apps/impala/gen-py/fb303/FacebookService.py
  17. 2 1
      apps/impala/gen-py/fb303/constants.py
  18. 1 0
      apps/impala/gen-py/fb303/ttypes.py
  19. 114 111
      apps/impala/gen-py/hive_metastore/ThriftHiveMetastore.py
  20. 2 1
      apps/impala/gen-py/hive_metastore/constants.py
  21. 116 114
      apps/impala/gen-py/hive_metastore/ttypes.py
  22. 1 1
      apps/impala/src/impala/api.py
  23. 2 2
      apps/impala/src/impala/conf.py
  24. 2 2
      apps/impala/src/impala/dbms.py
  25. 2 2
      apps/impala/src/impala/impala_flags.py
  26. 4 3
      apps/impala/src/impala/models.py
  27. 13 11
      apps/impala/src/impala/server.py
  28. 5 4
      apps/impala/src/impala/tests.py
  29. 3 2
      apps/impala/thrift/generate_error_codes.py

+ 2 - 1
apps/impala/gen-py/ErrorCodes/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -7,7 +8,7 @@
 #
 #
 
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from ErrorCodes.ttypes import *
 
 
 TErrorMessage = [
 TErrorMessage = [
   "",
   "",

+ 1 - 0
apps/impala/gen-py/ErrorCodes/ttypes.py

@@ -6,6 +6,7 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 
 
 from thrift.transport import TTransport
 from thrift.transport import TTransport

+ 2 - 1
apps/impala/gen-py/ExecStats/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -7,5 +8,5 @@
 #
 #
 
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from ExecStats.ttypes import *
 
 

+ 12 - 10
apps/impala/gen-py/ExecStats/ttypes.py

@@ -6,6 +6,8 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import Status.ttypes
 import Status.ttypes
 import Types.ttypes
 import Types.ttypes
@@ -144,7 +146,7 @@ class TExecStats(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -235,7 +237,7 @@ class TPlanNodeExecSummary(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.exec_stats = []
           self.exec_stats = []
           (_etype3, _size0) = iprot.readListBegin()
           (_etype3, _size0) = iprot.readListBegin()
-          for _i4 in xrange(_size0):
+          for _i4 in range(_size0):
             _elem5 = TExecStats()
             _elem5 = TExecStats()
             _elem5.read(iprot)
             _elem5.read(iprot)
             self.exec_stats.append(_elem5)
             self.exec_stats.append(_elem5)
@@ -246,7 +248,7 @@ class TPlanNodeExecSummary(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.is_active = []
           self.is_active = []
           (_etype9, _size6) = iprot.readListBegin()
           (_etype9, _size6) = iprot.readListBegin()
-          for _i10 in xrange(_size6):
+          for _i10 in range(_size6):
             _elem11 = iprot.readBool()
             _elem11 = iprot.readBool()
             self.is_active.append(_elem11)
             self.is_active.append(_elem11)
           iprot.readListEnd()
           iprot.readListEnd()
@@ -339,7 +341,7 @@ class TPlanNodeExecSummary(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -417,7 +419,7 @@ class TExecProgress(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -479,7 +481,7 @@ class TExecSummary(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.nodes = []
           self.nodes = []
           (_etype17, _size14) = iprot.readListBegin()
           (_etype17, _size14) = iprot.readListBegin()
-          for _i18 in xrange(_size14):
+          for _i18 in range(_size14):
             _elem19 = TPlanNodeExecSummary()
             _elem19 = TPlanNodeExecSummary()
             _elem19.read(iprot)
             _elem19.read(iprot)
             self.nodes.append(_elem19)
             self.nodes.append(_elem19)
@@ -490,7 +492,7 @@ class TExecSummary(object):
         if ftype == TType.MAP:
         if ftype == TType.MAP:
           self.exch_to_sender_map = {}
           self.exch_to_sender_map = {}
           (_ktype21, _vtype22, _size20 ) = iprot.readMapBegin()
           (_ktype21, _vtype22, _size20 ) = iprot.readMapBegin()
-          for _i24 in xrange(_size20):
+          for _i24 in range(_size20):
             _key25 = iprot.readI32()
             _key25 = iprot.readI32()
             _val26 = iprot.readI32()
             _val26 = iprot.readI32()
             self.exch_to_sender_map[_key25] = _val26
             self.exch_to_sender_map[_key25] = _val26
@@ -501,7 +503,7 @@ class TExecSummary(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.error_logs = []
           self.error_logs = []
           (_etype30, _size27) = iprot.readListBegin()
           (_etype30, _size27) = iprot.readListBegin()
-          for _i31 in xrange(_size27):
+          for _i31 in range(_size27):
             _elem32 = iprot.readString()
             _elem32 = iprot.readString()
             self.error_logs.append(_elem32)
             self.error_logs.append(_elem32)
           iprot.readListEnd()
           iprot.readListEnd()
@@ -541,7 +543,7 @@ class TExecSummary(object):
     if self.exch_to_sender_map is not None:
     if self.exch_to_sender_map is not None:
       oprot.writeFieldBegin('exch_to_sender_map', TType.MAP, 4)
       oprot.writeFieldBegin('exch_to_sender_map', TType.MAP, 4)
       oprot.writeMapBegin(TType.I32, TType.I32, len(self.exch_to_sender_map))
       oprot.writeMapBegin(TType.I32, TType.I32, len(self.exch_to_sender_map))
-      for kiter34,viter35 in self.exch_to_sender_map.items():
+      for kiter34,viter35 in list(self.exch_to_sender_map.items()):
         oprot.writeI32(kiter34)
         oprot.writeI32(kiter34)
         oprot.writeI32(viter35)
         oprot.writeI32(viter35)
       oprot.writeMapEnd()
       oprot.writeMapEnd()
@@ -578,7 +580,7 @@ class TExecSummary(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 7 - 5
apps/impala/gen-py/ImpalaService/ImpalaHiveServer2Service.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -6,10 +7,11 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import TCLIService.TCLIService
 import TCLIService.TCLIService
 import logging
 import logging
-from ttypes import *
+from ImpalaService.ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol, TProtocol
 from thrift.protocol import TBinaryProtocol, TProtocol
@@ -221,7 +223,7 @@ class GetExecSummary_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -286,7 +288,7 @@ class GetExecSummary_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -352,7 +354,7 @@ class GetRuntimeProfile_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -417,7 +419,7 @@ class GetRuntimeProfile_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 17 - 15
apps/impala/gen-py/ImpalaService/ImpalaService.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -6,10 +7,11 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import beeswaxd.BeeswaxService
 import beeswaxd.BeeswaxService
 import logging
 import logging
-from ttypes import *
+from ImpalaService.ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol, TProtocol
 from thrift.protocol import TBinaryProtocol, TProtocol
@@ -523,7 +525,7 @@ class Cancel_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -602,7 +604,7 @@ class Cancel_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -648,7 +650,7 @@ class ResetCatalog_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -713,7 +715,7 @@ class ResetCatalog_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -779,7 +781,7 @@ class ResetTable_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -844,7 +846,7 @@ class ResetTable_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -910,7 +912,7 @@ class GetRuntimeProfile_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -988,7 +990,7 @@ class GetRuntimeProfile_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1054,7 +1056,7 @@ class CloseInsert_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1147,7 +1149,7 @@ class CloseInsert_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1193,7 +1195,7 @@ class PingImpalaService_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1258,7 +1260,7 @@ class PingImpalaService_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1324,7 +1326,7 @@ class GetExecSummary_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1417,7 +1419,7 @@ class GetExecSummary_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 2 - 1
apps/impala/gen-py/ImpalaService/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -7,5 +8,5 @@
 #
 #
 
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from ImpalaService.ttypes import *
 
 

+ 11 - 9
apps/impala/gen-py/ImpalaService/ttypes.py

@@ -6,6 +6,8 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import ExecStats.ttypes
 import ExecStats.ttypes
 import Status.ttypes
 import Status.ttypes
@@ -151,7 +153,7 @@ class TInsertResult(object):
         if ftype == TType.MAP:
         if ftype == TType.MAP:
           self.rows_appended = {}
           self.rows_appended = {}
           (_ktype1, _vtype2, _size0 ) = iprot.readMapBegin()
           (_ktype1, _vtype2, _size0 ) = iprot.readMapBegin()
-          for _i4 in xrange(_size0):
+          for _i4 in range(_size0):
             _key5 = iprot.readString()
             _key5 = iprot.readString()
             _val6 = iprot.readI64()
             _val6 = iprot.readI64()
             self.rows_appended[_key5] = _val6
             self.rows_appended[_key5] = _val6
@@ -171,7 +173,7 @@ class TInsertResult(object):
     if self.rows_appended is not None:
     if self.rows_appended is not None:
       oprot.writeFieldBegin('rows_appended', TType.MAP, 1)
       oprot.writeFieldBegin('rows_appended', TType.MAP, 1)
       oprot.writeMapBegin(TType.STRING, TType.I64, len(self.rows_appended))
       oprot.writeMapBegin(TType.STRING, TType.I64, len(self.rows_appended))
-      for kiter7,viter8 in self.rows_appended.items():
+      for kiter7,viter8 in list(self.rows_appended.items()):
         oprot.writeString(kiter7)
         oprot.writeString(kiter7)
         oprot.writeI64(viter8)
         oprot.writeI64(viter8)
       oprot.writeMapEnd()
       oprot.writeMapEnd()
@@ -192,7 +194,7 @@ class TInsertResult(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -257,7 +259,7 @@ class TPingImpalaServiceResp(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -339,7 +341,7 @@ class TResetTableReq(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -419,7 +421,7 @@ class TGetExecSummaryReq(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -501,7 +503,7 @@ class TGetExecSummaryResp(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -581,7 +583,7 @@ class TGetRuntimeProfileReq(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -662,7 +664,7 @@ class TGetRuntimeProfileResp(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 2 - 1
apps/impala/gen-py/Status/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -7,5 +8,5 @@
 #
 #
 
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from Status.ttypes import *
 
 

+ 4 - 2
apps/impala/gen-py/Status/ttypes.py

@@ -6,6 +6,8 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import ErrorCodes.ttypes
 import ErrorCodes.ttypes
 
 
@@ -54,7 +56,7 @@ class TStatus(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.error_msgs = []
           self.error_msgs = []
           (_etype3, _size0) = iprot.readListBegin()
           (_etype3, _size0) = iprot.readListBegin()
-          for _i4 in xrange(_size0):
+          for _i4 in range(_size0):
             _elem5 = iprot.readString()
             _elem5 = iprot.readString()
             self.error_msgs.append(_elem5)
             self.error_msgs.append(_elem5)
           iprot.readListEnd()
           iprot.readListEnd()
@@ -98,7 +100,7 @@ class TStatus(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 2 - 1
apps/impala/gen-py/Types/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -7,5 +8,5 @@
 #
 #
 
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from Types.ttypes import *
 
 

+ 15 - 13
apps/impala/gen-py/Types/ttypes.py

@@ -6,6 +6,8 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 
 
 from thrift.transport import TTransport
 from thrift.transport import TTransport
@@ -276,7 +278,7 @@ class TScalarType(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -356,7 +358,7 @@ class TStructField(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -409,7 +411,7 @@ class TTypeNode(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.struct_fields = []
           self.struct_fields = []
           (_etype3, _size0) = iprot.readListBegin()
           (_etype3, _size0) = iprot.readListBegin()
-          for _i4 in xrange(_size0):
+          for _i4 in range(_size0):
             _elem5 = TStructField()
             _elem5 = TStructField()
             _elem5.read(iprot)
             _elem5.read(iprot)
             self.struct_fields.append(_elem5)
             self.struct_fields.append(_elem5)
@@ -459,7 +461,7 @@ class TTypeNode(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -495,7 +497,7 @@ class TColumnType(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.types = []
           self.types = []
           (_etype10, _size7) = iprot.readListBegin()
           (_etype10, _size7) = iprot.readListBegin()
-          for _i11 in xrange(_size7):
+          for _i11 in range(_size7):
             _elem12 = TTypeNode()
             _elem12 = TTypeNode()
             _elem12.read(iprot)
             _elem12.read(iprot)
             self.types.append(_elem12)
             self.types.append(_elem12)
@@ -533,7 +535,7 @@ class TColumnType(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -615,7 +617,7 @@ class TNetworkAddress(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -697,7 +699,7 @@ class TUniqueId(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -777,7 +779,7 @@ class TFunctionName(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -870,7 +872,7 @@ class TScalarFunction(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1046,7 +1048,7 @@ class TAggregateFunction(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1120,7 +1122,7 @@ class TFunction(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.arg_types = []
           self.arg_types = []
           (_etype17, _size14) = iprot.readListBegin()
           (_etype17, _size14) = iprot.readListBegin()
-          for _i18 in xrange(_size14):
+          for _i18 in range(_size14):
             _elem19 = TColumnType()
             _elem19 = TColumnType()
             _elem19.read(iprot)
             _elem19.read(iprot)
             self.arg_types.append(_elem19)
             self.arg_types.append(_elem19)
@@ -1251,7 +1253,7 @@ class TFunction(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 29 - 26
apps/impala/gen-py/beeswaxd/BeeswaxService.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -6,9 +7,11 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import logging
 import logging
-from ttypes import *
+from beeswaxd.ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol, TProtocol
 from thrift.protocol import TBinaryProtocol, TProtocol
@@ -894,7 +897,7 @@ class query_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -973,7 +976,7 @@ class query_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1052,7 +1055,7 @@ class executeAndWait_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1131,7 +1134,7 @@ class executeAndWait_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1197,7 +1200,7 @@ class explain_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1276,7 +1279,7 @@ class explain_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1368,7 +1371,7 @@ class fetch_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1461,7 +1464,7 @@ class fetch_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1527,7 +1530,7 @@ class get_state_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1605,7 +1608,7 @@ class get_state_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1671,7 +1674,7 @@ class get_results_metadata_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1750,7 +1753,7 @@ class get_results_metadata_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1815,7 +1818,7 @@ class echo_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1879,7 +1882,7 @@ class echo_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1925,7 +1928,7 @@ class dump_config_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1989,7 +1992,7 @@ class dump_config_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2054,7 +2057,7 @@ class get_log_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2132,7 +2135,7 @@ class get_log_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2197,7 +2200,7 @@ class get_default_configuration_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2232,7 +2235,7 @@ class get_default_configuration_result(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.success = []
           self.success = []
           (_etype24, _size21) = iprot.readListBegin()
           (_etype24, _size21) = iprot.readListBegin()
-          for _i25 in xrange(_size21):
+          for _i25 in range(_size21):
             _elem26 = ConfigVariable()
             _elem26 = ConfigVariable()
             _elem26.read(iprot)
             _elem26.read(iprot)
             self.success.append(_elem26)
             self.success.append(_elem26)
@@ -2270,7 +2273,7 @@ class get_default_configuration_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2336,7 +2339,7 @@ class close_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2416,7 +2419,7 @@ class close_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2481,7 +2484,7 @@ class clean_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2527,7 +2530,7 @@ class clean_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 2 - 1
apps/impala/gen-py/beeswaxd/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -7,5 +8,5 @@
 #
 #
 
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from beeswaxd.ttypes import *
 
 

+ 13 - 11
apps/impala/gen-py/beeswaxd/ttypes.py

@@ -6,6 +6,8 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import hive_metastore.ttypes
 import hive_metastore.ttypes
 
 
@@ -84,7 +86,7 @@ class Query(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.configuration = []
           self.configuration = []
           (_etype3, _size0) = iprot.readListBegin()
           (_etype3, _size0) = iprot.readListBegin()
-          for _i4 in xrange(_size0):
+          for _i4 in range(_size0):
             _elem5 = iprot.readString()
             _elem5 = iprot.readString()
             self.configuration.append(_elem5)
             self.configuration.append(_elem5)
           iprot.readListEnd()
           iprot.readListEnd()
@@ -136,7 +138,7 @@ class Query(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -214,7 +216,7 @@ class QueryHandle(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -279,7 +281,7 @@ class QueryExplanation(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -332,7 +334,7 @@ class Results(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.columns = []
           self.columns = []
           (_etype10, _size7) = iprot.readListBegin()
           (_etype10, _size7) = iprot.readListBegin()
-          for _i11 in xrange(_size7):
+          for _i11 in range(_size7):
             _elem12 = iprot.readString()
             _elem12 = iprot.readString()
             self.columns.append(_elem12)
             self.columns.append(_elem12)
           iprot.readListEnd()
           iprot.readListEnd()
@@ -342,7 +344,7 @@ class Results(object):
         if ftype == TType.LIST:
         if ftype == TType.LIST:
           self.data = []
           self.data = []
           (_etype16, _size13) = iprot.readListBegin()
           (_etype16, _size13) = iprot.readListBegin()
-          for _i17 in xrange(_size13):
+          for _i17 in range(_size13):
             _elem18 = iprot.readString()
             _elem18 = iprot.readString()
             self.data.append(_elem18)
             self.data.append(_elem18)
           iprot.readListEnd()
           iprot.readListEnd()
@@ -412,7 +414,7 @@ class Results(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -520,7 +522,7 @@ class ResultsMetadata(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -641,7 +643,7 @@ class BeeswaxException(TException):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -690,7 +692,7 @@ class QueryNotFoundException(TException):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -783,7 +785,7 @@ class ConfigVariable(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 32 - 29
apps/impala/gen-py/fb303/FacebookService.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -6,9 +7,11 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import range
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 import logging
 import logging
-from ttypes import *
+from fb303.ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
 from thrift.transport import TTransport
 from thrift.protocol import TBinaryProtocol, TProtocol
 from thrift.protocol import TBinaryProtocol, TProtocol
@@ -794,7 +797,7 @@ class getName_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -858,7 +861,7 @@ class getName_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -904,7 +907,7 @@ class getVersion_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -968,7 +971,7 @@ class getVersion_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1014,7 +1017,7 @@ class getStatus_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1078,7 +1081,7 @@ class getStatus_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1124,7 +1127,7 @@ class getStatusDetails_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1188,7 +1191,7 @@ class getStatusDetails_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1234,7 +1237,7 @@ class getCounters_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1269,7 +1272,7 @@ class getCounters_result(object):
         if ftype == TType.MAP:
         if ftype == TType.MAP:
           self.success = {}
           self.success = {}
           (_ktype1, _vtype2, _size0 ) = iprot.readMapBegin()
           (_ktype1, _vtype2, _size0 ) = iprot.readMapBegin()
-          for _i4 in xrange(_size0):
+          for _i4 in range(_size0):
             _key5 = iprot.readString()
             _key5 = iprot.readString()
             _val6 = iprot.readI64()
             _val6 = iprot.readI64()
             self.success[_key5] = _val6
             self.success[_key5] = _val6
@@ -1289,7 +1292,7 @@ class getCounters_result(object):
     if self.success is not None:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.MAP, 0)
       oprot.writeFieldBegin('success', TType.MAP, 0)
       oprot.writeMapBegin(TType.STRING, TType.I64, len(self.success))
       oprot.writeMapBegin(TType.STRING, TType.I64, len(self.success))
-      for kiter7,viter8 in self.success.items():
+      for kiter7,viter8 in list(self.success.items()):
         oprot.writeString(kiter7)
         oprot.writeString(kiter7)
         oprot.writeI64(viter8)
         oprot.writeI64(viter8)
       oprot.writeMapEnd()
       oprot.writeMapEnd()
@@ -1308,7 +1311,7 @@ class getCounters_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1373,7 +1376,7 @@ class getCounter_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1437,7 +1440,7 @@ class getCounter_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1515,7 +1518,7 @@ class setOption_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1561,7 +1564,7 @@ class setOption_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1626,7 +1629,7 @@ class getOption_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1690,7 +1693,7 @@ class getOption_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1736,7 +1739,7 @@ class getOptions_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1771,7 +1774,7 @@ class getOptions_result(object):
         if ftype == TType.MAP:
         if ftype == TType.MAP:
           self.success = {}
           self.success = {}
           (_ktype10, _vtype11, _size9 ) = iprot.readMapBegin()
           (_ktype10, _vtype11, _size9 ) = iprot.readMapBegin()
-          for _i13 in xrange(_size9):
+          for _i13 in range(_size9):
             _key14 = iprot.readString()
             _key14 = iprot.readString()
             _val15 = iprot.readString()
             _val15 = iprot.readString()
             self.success[_key14] = _val15
             self.success[_key14] = _val15
@@ -1791,7 +1794,7 @@ class getOptions_result(object):
     if self.success is not None:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.MAP, 0)
       oprot.writeFieldBegin('success', TType.MAP, 0)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
-      for kiter16,viter17 in self.success.items():
+      for kiter16,viter17 in list(self.success.items()):
         oprot.writeString(kiter16)
         oprot.writeString(kiter16)
         oprot.writeString(viter17)
         oprot.writeString(viter17)
       oprot.writeMapEnd()
       oprot.writeMapEnd()
@@ -1810,7 +1813,7 @@ class getOptions_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1875,7 +1878,7 @@ class getCpuProfile_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1939,7 +1942,7 @@ class getCpuProfile_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -1985,7 +1988,7 @@ class aliveSince_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2049,7 +2052,7 @@ class aliveSince_result(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2095,7 +2098,7 @@ class reinitialize_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):
@@ -2141,7 +2144,7 @@ class shutdown_args(object):
 
 
   def __repr__(self):
   def __repr__(self):
     L = ['%s=%r' % (key, value)
     L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
+      for key, value in self.__dict__.items()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
 
 
   def __eq__(self, other):
   def __eq__(self, other):

+ 2 - 1
apps/impala/gen-py/fb303/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -7,5 +8,5 @@
 #
 #
 
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from fb303.ttypes import *
 
 

+ 1 - 0
apps/impala/gen-py/fb303/ttypes.py

@@ -6,6 +6,7 @@
 #  options string: py:new_style
 #  options string: py:new_style
 #
 #
 
 
+from builtins import object
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 
 
 from thrift.transport import TTransport
 from thrift.transport import TTransport

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 114 - 111
apps/impala/gen-py/hive_metastore/ThriftHiveMetastore.py


+ 2 - 1
apps/impala/gen-py/hive_metastore/constants.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 #
 #
 # Autogenerated by Thrift Compiler (0.9.3)
 # Autogenerated by Thrift Compiler (0.9.3)
 #
 #
@@ -7,7 +8,7 @@
 #
 #
 
 
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
 from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-from ttypes import *
+from hive_metastore.ttypes import *
 
 
 DDL_TIME = "transient_lastDdlTime"
 DDL_TIME = "transient_lastDdlTime"
 HIVE_FILTER_FIELD_OWNER = "hive_filter_field_owner__"
 HIVE_FILTER_FIELD_OWNER = "hive_filter_field_owner__"

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 116 - 114
apps/impala/gen-py/hive_metastore/ttypes.py


+ 1 - 1
apps/impala/src/impala/api.py

@@ -151,7 +151,7 @@ def alanize(request):
       metrics = analyzer.heatmap_by_host(profile, key)
       metrics = analyzer.heatmap_by_host(profile, key)
       if metrics['data']:
       if metrics['data']:
         heatmap[key] = metrics
         heatmap[key] = metrics
-    response['data'] = { 'query': { 'healthChecks' : result[0]['result'], 'summary': summary, 'heatmap': heatmap, 'heatmapMetrics': sorted(list(heatmap.iterkeys())) } }
+    response['data'] = { 'query': { 'healthChecks' : result[0]['result'], 'summary': summary, 'heatmap': heatmap, 'heatmapMetrics': sorted(list(heatmap.keys())) } }
     response['status'] = 0
     response['status'] = 0
   return JsonResponse(response)
   return JsonResponse(response)
 
 

+ 2 - 2
apps/impala/src/impala/conf.py

@@ -241,14 +241,14 @@ def config_validator(user):
         if handle:
         if handle:
           server.fetch(handle, rows=100)
           server.fetch(handle, rows=100)
           server.close(handle)
           server.close(handle)
-    except StructuredThriftTransportException, ex:
+    except StructuredThriftTransportException as ex:
       if 'TSocket read 0 bytes' in str(ex):  # this message appears when authentication fails
       if 'TSocket read 0 bytes' in str(ex):  # this message appears when authentication fails
         msg = "Failed to authenticate to Impalad, check authentication configurations."
         msg = "Failed to authenticate to Impalad, check authentication configurations."
         LOG.exception(msg)
         LOG.exception(msg)
         res.append((NICE_NAME, _(msg)))
         res.append((NICE_NAME, _(msg)))
       else:
       else:
         raise ex
         raise ex
-  except Exception, ex:
+  except Exception as ex:
     msg = "No available Impalad to send queries to."
     msg = "No available Impalad to send queries to."
     LOG.exception(msg)
     LOG.exception(msg)
     res.append((NICE_NAME, _(msg)))
     res.append((NICE_NAME, _(msg)))

+ 2 - 2
apps/impala/src/impala/dbms.py

@@ -139,7 +139,7 @@ class ImpalaDbms(HiveServer2Dbms):
       hql = "REFRESH `%s`.`%s`" % (database, table)
       hql = "REFRESH `%s`.`%s`" % (database, table)
       query = hql_query(hql, database, query_type=QUERY_TYPES[1])
       query = hql_query(hql, database, query_type=QUERY_TYPES[1])
       handle = self.execute_and_wait(query, timeout_sec=10.0)
       handle = self.execute_and_wait(query, timeout_sec=10.0)
-    except Exception, e:
+    except Exception as e:
       msg = 'Failed to refresh `%s`.`%s`' % (database, table)
       msg = 'Failed to refresh `%s`.`%s`' % (database, table)
       raise QueryServerException(msg)
       raise QueryServerException(msg)
     finally:
     finally:
@@ -165,7 +165,7 @@ class ImpalaDbms(HiveServer2Dbms):
         histogram = list(result.rows())[0][0]  # actual histogram results is in first-and-only result row
         histogram = list(result.rows())[0][0]  # actual histogram results is in first-and-only result row
         unique_values = set(histogram.split(', '))
         unique_values = set(histogram.split(', '))
         results = list(unique_values)
         results = list(unique_values)
-      except IndexError, e:
+      except IndexError as e:
         LOG.warn('Failed to get histogram results, result set has unexpected format: %s' % smart_str(e))
         LOG.warn('Failed to get histogram results, result set has unexpected format: %s' % smart_str(e))
       finally:
       finally:
         self.close(handle)
         self.close(handle)

+ 2 - 2
apps/impala/src/impala/impala_flags.py

@@ -82,10 +82,10 @@ def _parse_impala_flags():
   try:
   try:
     impala_flags_path = os.path.join(conf.IMPALA_CONF_DIR.get(), 'impalad_flags')
     impala_flags_path = os.path.join(conf.IMPALA_CONF_DIR.get(), 'impalad_flags')
     _IMPALA_FLAGS = dict(line.strip().split('=', 1) for line in open(impala_flags_path) if '=' in line)
     _IMPALA_FLAGS = dict(line.strip().split('=', 1) for line in open(impala_flags_path) if '=' in line)
-  except IOError, err:
+  except IOError as err:
     if err.errno != errno.ENOENT:
     if err.errno != errno.ENOENT:
       LOG.error('Cannot read from "%s": %s' % (impala_flags_path, err))
       LOG.error('Cannot read from "%s": %s' % (impala_flags_path, err))
     _IMPALA_FLAGS = {}
     _IMPALA_FLAGS = {}
-  except Exception, ex:
+  except Exception as ex:
     LOG.error('Failed to parse Impala config from "%s": %s' % (impala_flags_path, ex))
     LOG.error('Failed to parse Impala config from "%s": %s' % (impala_flags_path, ex))
     _IMPALA_FLAGS = {}
     _IMPALA_FLAGS = {}

+ 4 - 3
apps/impala/src/impala/models.py

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # limitations under the License.
 
 
+from builtins import object
 import json
 import json
 import logging
 import logging
 
 
@@ -25,7 +26,7 @@ from beeswax.server import dbms
 LOG = logging.getLogger(__name__)
 LOG = logging.getLogger(__name__)
 
 
 
 
-class Dashboard():
+class Dashboard(object):
 
 
   def __init__(self, data=None, document=None):
   def __init__(self, data=None, document=None):
     self.document = document
     self.document = document
@@ -65,7 +66,7 @@ class Dashboard():
     return json.loads(self.data)
     return json.loads(self.data)
 
 
 
 
-class Controller():
+class Controller(object):
 
 
   def __init__(self, user):
   def __init__(self, user):
     query_server = get_query_server_config(name='impala')
     query_server = get_query_server_config(name='impala')
@@ -76,6 +77,6 @@ class Controller():
     try:
     try:
       _table = self.db.get_table(database, table)
       _table = self.db.get_table(database, table)
       return [dict([('name', col.name), ('type', col.type), ('comment', col.comment)]) for col in _table.cols]
       return [dict([('name', col.name), ('type', col.type), ('comment', col.comment)]) for col in _table.cols]
-    except QueryServerException, e:
+    except QueryServerException as e:
       LOG.exception('Error fetching %s.%s' % (database, table))
       LOG.exception('Error fetching %s.%s' % (database, table))
       return []
       return []

+ 13 - 11
apps/impala/src/impala/server.py

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # limitations under the License.
 
 
+from past.builtins import basestring
+from builtins import object
 import json
 import json
 import logging
 import logging
 import threading
 import threading
@@ -80,7 +82,7 @@ class ImpalaServerClient(HiveServerClient):
     # GetExecSummary() only works for closed queries
     # GetExecSummary() only works for closed queries
     try:
     try:
       self.close_operation(operation_handle)
       self.close_operation(operation_handle)
-    except QueryServerException, e:
+    except QueryServerException as e:
       LOG.warn('Failed to close operation for query handle, query may be invalid or already closed.')
       LOG.warn('Failed to close operation for query handle, query may be invalid or already closed.')
 
 
     resp = self.call(self._client.GetExecSummary, req)
     resp = self.call(self._client.GetExecSummary, req)
@@ -98,7 +100,7 @@ class ImpalaServerClient(HiveServerClient):
     # TGetRuntimeProfileReq() only works for closed queries
     # TGetRuntimeProfileReq() only works for closed queries
     try:
     try:
       self.close_operation(operation_handle)
       self.close_operation(operation_handle)
-    except QueryServerException, e:
+    except QueryServerException as e:
       LOG.warn('Failed to close operation for query handle, query may be invalid or already closed.')
       LOG.warn('Failed to close operation for query handle, query may be invalid or already closed.')
 
 
     resp = self.call(self._client.GetRuntimeProfile, req)
     resp = self.call(self._client.GetRuntimeProfile, req)
@@ -136,7 +138,7 @@ class ImpalaServerClient(HiveServerClient):
           summary_dict['nodes'].append(node_dict)
           summary_dict['nodes'].append(node_dict)
 
 
       return summary_dict
       return summary_dict
-    except Exception, e:
+    except Exception as e:
       raise ImpalaServerClientException('Failed to serialize the TExecSummary object: %s' % str(e))
       raise ImpalaServerClientException('Failed to serialize the TExecSummary object: %s' % str(e))
 
 
 
 
@@ -191,7 +193,7 @@ class ImpalaDaemonApi(object):
         return json.loads(resp)
         return json.loads(resp)
       else:
       else:
         return resp
         return resp
-    except ValueError, e:
+    except ValueError as e:
       raise ImpalaDaemonApiException('ImpalaDaemonApi did not return valid JSON: %s' % e)
       raise ImpalaDaemonApiException('ImpalaDaemonApi did not return valid JSON: %s' % e)
 
 
 
 
@@ -207,7 +209,7 @@ class ImpalaDaemonApi(object):
         return json.loads(resp)
         return json.loads(resp)
       else:
       else:
         return resp
         return resp
-    except ValueError, e:
+    except ValueError as e:
       raise ImpalaDaemonApiException('ImpalaDaemonApi did not return valid JSON: %s' % e)
       raise ImpalaDaemonApiException('ImpalaDaemonApi did not return valid JSON: %s' % e)
 
 
 
 
@@ -223,7 +225,7 @@ class ImpalaDaemonApi(object):
         return json.loads(resp)
         return json.loads(resp)
       else:
       else:
         return resp
         return resp
-    except ValueError, e:
+    except ValueError as e:
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_profile did not return valid JSON: %s' % e)
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_profile did not return valid JSON: %s' % e)
 
 
   def get_query_memory(self, query_id):
   def get_query_memory(self, query_id):
@@ -238,7 +240,7 @@ class ImpalaDaemonApi(object):
         return json.loads(resp)
         return json.loads(resp)
       else:
       else:
         return resp
         return resp
-    except ValueError, e:
+    except ValueError as e:
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_memory did not return valid JSON: %s' % e)
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_memory did not return valid JSON: %s' % e)
 
 
   def kill(self, query_id):
   def kill(self, query_id):
@@ -252,7 +254,7 @@ class ImpalaDaemonApi(object):
         return json.loads(resp)
         return json.loads(resp)
       else:
       else:
         return resp
         return resp
-    except ValueError, e:
+    except ValueError as e:
       raise ImpalaDaemonApiException('ImpalaDaemonApi kill did not return valid JSON: %s' % e)
       raise ImpalaDaemonApiException('ImpalaDaemonApi kill did not return valid JSON: %s' % e)
 
 
   def get_query_backends(self, query_id):
   def get_query_backends(self, query_id):
@@ -267,7 +269,7 @@ class ImpalaDaemonApi(object):
         return json.loads(resp)
         return json.loads(resp)
       else:
       else:
         return resp
         return resp
-    except ValueError, e:
+    except ValueError as e:
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_backends did not return valid JSON: %s' % e)
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_backends did not return valid JSON: %s' % e)
 
 
   def get_query_finstances(self, query_id):
   def get_query_finstances(self, query_id):
@@ -282,7 +284,7 @@ class ImpalaDaemonApi(object):
         return json.loads(resp)
         return json.loads(resp)
       else:
       else:
         return resp
         return resp
-    except ValueError, e:
+    except ValueError as e:
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_finstances did not return valid JSON: %s' % e)
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_finstances did not return valid JSON: %s' % e)
 
 
   def get_query_summary(self, query_id):
   def get_query_summary(self, query_id):
@@ -297,7 +299,7 @@ class ImpalaDaemonApi(object):
         return json.loads(resp)
         return json.loads(resp)
       else:
       else:
         return resp
         return resp
-    except ValueError, e:
+    except ValueError as e:
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_summary did not return valid JSON: %s' % e)
       raise ImpalaDaemonApiException('ImpalaDaemonApi query_summary did not return valid JSON: %s' % e)
 
 
   def get_query_profile_encoded(self, query_id):
   def get_query_profile_encoded(self, query_id):

+ 5 - 4
apps/impala/src/impala/tests.py

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # limitations under the License.
 
 
+from builtins import object
 import json
 import json
 import logging
 import logging
 import re
 import re
@@ -49,7 +50,7 @@ from impala.dbms import ImpalaDbms
 LOG = logging.getLogger(__name__)
 LOG = logging.getLogger(__name__)
 
 
 
 
-class MockDbms:
+class MockDbms(object):
 
 
   def get_databases(self):
   def get_databases(self):
     return ['db1', 'db2']
     return ['db1', 'db2']
@@ -58,7 +59,7 @@ class MockDbms:
     return ['table1', 'table2']
     return ['table1', 'table2']
 
 
 
 
-class TestMockedImpala:
+class TestMockedImpala(object):
 
 
   def setUp(self):
   def setUp(self):
     self.client = make_logged_in_client()
     self.client = make_logged_in_client()
@@ -131,7 +132,7 @@ class TestMockedImpala:
         assert_true(ddms.client.query.call_count == 3) # Third call
         assert_true(ddms.client.query.call_count == 3) # Third call
         assert_true('customers' not in ddms.client.query.call_args[0][0].hql_query) # Full invalidate
         assert_true('customers' not in ddms.client.query.call_args[0][0].hql_query) # Full invalidate
 
 
-class TestImpalaIntegration:
+class TestImpalaIntegration(object):
   integration = True
   integration = True
 
 
   @classmethod
   @classmethod
@@ -500,7 +501,7 @@ def test_ssl_validate():
         reset()
         reset()
 
 
 
 
-class TestImpalaDbms():
+class TestImpalaDbms(object):
 
 
   def test_get_impala_nested_select(self):
   def test_get_impala_nested_select(self):
     assert_equal(ImpalaDbms.get_nested_select('default', 'customers', 'id', None), ('id', '`default`.`customers`'))
     assert_equal(ImpalaDbms.get_nested_select('default', 'customers', 'id', None), ('id', '`default`.`customers`'))

+ 3 - 2
apps/impala/thrift/generate_error_codes.py

@@ -21,6 +21,7 @@
 #
 #
 # TODO Add support for SQL Error Codes
 # TODO Add support for SQL Error Codes
 #      https://msdn.microsoft.com/en-us/library/ms714687%28v=vs.85%29.aspx
 #      https://msdn.microsoft.com/en-us/library/ms714687%28v=vs.85%29.aspx
+from __future__ import print_function
 error_codes = (
 error_codes = (
   ("OK", 1, ""),
   ("OK", 1, ""),
 
 
@@ -260,11 +261,11 @@ fid = open(target_file, "w+")
 try:
 try:
   fid.write(preamble)
   fid.write(preamble)
   fid.write("""\nenum TErrorCode {\n""")
   fid.write("""\nenum TErrorCode {\n""")
-  fid.write(",\n".join(map(lambda x: "  %s" % x[0], error_codes)))
+  fid.write(",\n".join(["  %s" % x[0] for x in error_codes]))
   fid.write("\n}")
   fid.write("\n}")
   fid.write("\n")
   fid.write("\n")
   fid.write("const list<string> TErrorMessage = [\n")
   fid.write("const list<string> TErrorMessage = [\n")
-  fid.write(",\n".join(map(lambda x: "  // %s\n  \"%s\"" %(x[0], x[2]), error_codes)))
+  fid.write(",\n".join(["  // %s\n  \"%s\"" %(x[0], x[2]) for x in error_codes]))
   fid.write("\n]")
   fid.write("\n]")
 finally:
 finally:
   fid.close()
   fid.close()

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels