Modified: hive/trunk/service/src/gen/thrift/gen-php/hive_service/ThriftHive.php URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-php/hive_service/ThriftHive.php?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-php/hive_service/ThriftHive.php (original) +++ hive/trunk/service/src/gen/thrift/gen-php/hive_service/ThriftHive.php Mon Sep 5 08:47:02 2011 @@ -1,6 +1,6 @@ <?php /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -1214,7 +1214,7 @@ class ThriftHive_getSchema_result { 0 => array( 'var' => 'success', 'type' => TType::STRUCT, - 'class' => 'metastore_Schema', + 'class' => 'Schema', ), 1 => array( 'var' => 'ex', @@ -1254,7 +1254,7 @@ class ThriftHive_getSchema_result { { case 0: if ($ftype == TType::STRUCT) { - $this->success = new metastore_Schema(); + $this->success = new Schema(); $xfer += $this->success->read($input); } else { $xfer += $input->skip($ftype); @@ -1363,7 +1363,7 @@ class ThriftHive_getThriftSchema_result 0 => array( 'var' => 'success', 'type' => TType::STRUCT, - 'class' => 'metastore_Schema', + 'class' => 'Schema', ), 1 => array( 'var' => 'ex', @@ -1403,7 +1403,7 @@ class ThriftHive_getThriftSchema_result { case 0: if ($ftype == TType::STRUCT) { - $this->success = new metastore_Schema(); + $this->success = new Schema(); $xfer += $this->success->read($input); } else { $xfer += $input->skip($ftype);
Modified: hive/trunk/service/src/gen/thrift/gen-php/hive_service/hive_service_types.php URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-php/hive_service/hive_service_types.php?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-php/hive_service/hive_service_types.php (original) +++ hive/trunk/service/src/gen/thrift/gen-php/hive_service/hive_service_types.php Mon Sep 5 08:47:02 2011 @@ -1,6 +1,6 @@ <?php /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ Modified: hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive-remote URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive-remote?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive-remote (original) +++ hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive-remote Mon Sep 5 08:47:02 2011 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Autogenerated by Thrift +# Autogenerated by Thrift Compiler (0.7.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # Modified: hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py (original) +++ hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py Mon Sep 5 08:47:02 2011 @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift +# Autogenerated by Thrift Compiler (0.7.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -83,7 +83,7 @@ class Client(hive_metastore.ThriftHiveMe result = execute_result() result.read(self._iprot) self._iprot.readMessageEnd() - if result.ex != None: + if result.ex is not None: raise result.ex return @@ -108,9 +108,9 @@ class Client(hive_metastore.ThriftHiveMe result = fetchOne_result() result.read(self._iprot) self._iprot.readMessageEnd() - if result.success != None: + if result.success is not None: return result.success - if result.ex != None: + if result.ex is not None: raise result.ex raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchOne failed: unknown result"); @@ -140,9 +140,9 @@ class Client(hive_metastore.ThriftHiveMe result = fetchN_result() result.read(self._iprot) self._iprot.readMessageEnd() - if result.success != None: + if result.success is not None: return result.success - if result.ex != None: + if result.ex is not None: raise result.ex raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchN failed: unknown result"); @@ -167,9 +167,9 @@ class Client(hive_metastore.ThriftHiveMe result = fetchAll_result() result.read(self._iprot) self._iprot.readMessageEnd() - if result.success != None: + if result.success is not None: return result.success - if result.ex != None: + if result.ex is not None: raise result.ex raise TApplicationException(TApplicationException.MISSING_RESULT, "fetchAll failed: unknown result"); @@ -194,9 +194,9 @@ class Client(hive_metastore.ThriftHiveMe result = getSchema_result() result.read(self._iprot) self._iprot.readMessageEnd() - if result.success != None: + if result.success is not None: return result.success - if result.ex != None: + if result.ex is not None: raise result.ex raise TApplicationException(TApplicationException.MISSING_RESULT, "getSchema failed: unknown result"); @@ -221,9 +221,9 @@ class Client(hive_metastore.ThriftHiveMe result = getThriftSchema_result() result.read(self._iprot) self._iprot.readMessageEnd() - if result.success != None: + if result.success is not None: return result.success - if result.ex != None: + if result.ex is not None: raise result.ex raise TApplicationException(TApplicationException.MISSING_RESULT, "getThriftSchema failed: unknown result"); @@ -248,9 +248,9 @@ class Client(hive_metastore.ThriftHiveMe result = getClusterStatus_result() result.read(self._iprot) self._iprot.readMessageEnd() - if result.success != None: + if result.success is not None: return result.success - if result.ex != None: + if result.ex is not None: raise result.ex raise TApplicationException(TApplicationException.MISSING_RESULT, "getClusterStatus failed: unknown result"); @@ -275,9 +275,9 @@ class Client(hive_metastore.ThriftHiveMe result = getQueryPlan_result() result.read(self._iprot) self._iprot.readMessageEnd() - if result.success != None: + if result.success is not None: return result.success - if result.ex != None: + if result.ex is not None: raise result.ex raise TApplicationException(TApplicationException.MISSING_RESULT, "getQueryPlan failed: unknown result"); @@ -497,14 +497,15 @@ class execute_args: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('execute_args') - if self.query != None: + if self.query is not None: oprot.writeFieldBegin('query', TType.STRING, 1) oprot.writeString(self.query) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -557,14 +558,15 @@ class execute_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('execute_result') - if self.ex != None: + if self.ex is not None: oprot.writeFieldBegin('ex', TType.STRUCT, 1) self.ex.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -604,8 +606,9 @@ class fetchOne_args: oprot.writeStructBegin('fetchOne_args') oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -665,18 +668,19 @@ class fetchOne_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('fetchOne_result') - if self.success != None: + if self.success is not None: oprot.writeFieldBegin('success', TType.STRING, 0) oprot.writeString(self.success) oprot.writeFieldEnd() - if self.ex != None: + if self.ex is not None: oprot.writeFieldBegin('ex', TType.STRUCT, 1) self.ex.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -728,14 +732,15 @@ class fetchN_args: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('fetchN_args') - if self.numRows != None: + if self.numRows is not None: oprot.writeFieldBegin('numRows', TType.I32, 1) oprot.writeI32(self.numRows) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -800,21 +805,22 @@ class fetchN_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('fetchN_result') - if self.success != None: + if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRING, len(self.success)) for iter6 in self.success: oprot.writeString(iter6) oprot.writeListEnd() oprot.writeFieldEnd() - if self.ex != None: + if self.ex is not None: oprot.writeFieldBegin('ex', TType.STRUCT, 1) self.ex.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -854,8 +860,9 @@ class fetchAll_args: oprot.writeStructBegin('fetchAll_args') oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -920,21 +927,22 @@ class fetchAll_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('fetchAll_result') - if self.success != None: + if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRING, len(self.success)) for iter13 in self.success: oprot.writeString(iter13) oprot.writeListEnd() oprot.writeFieldEnd() - if self.ex != None: + if self.ex is not None: oprot.writeFieldBegin('ex', TType.STRUCT, 1) self.ex.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -974,8 +982,9 @@ class getSchema_args: oprot.writeStructBegin('getSchema_args') oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1036,18 +1045,19 @@ class getSchema_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('getSchema_result') - if self.success != None: + if self.success is not None: oprot.writeFieldBegin('success', TType.STRUCT, 0) self.success.write(oprot) oprot.writeFieldEnd() - if self.ex != None: + if self.ex is not None: oprot.writeFieldBegin('ex', TType.STRUCT, 1) self.ex.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1087,8 +1097,9 @@ class getThriftSchema_args: oprot.writeStructBegin('getThriftSchema_args') oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1149,18 +1160,19 @@ class getThriftSchema_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('getThriftSchema_result') - if self.success != None: + if self.success is not None: oprot.writeFieldBegin('success', TType.STRUCT, 0) self.success.write(oprot) oprot.writeFieldEnd() - if self.ex != None: + if self.ex is not None: oprot.writeFieldBegin('ex', TType.STRUCT, 1) self.ex.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1200,8 +1212,9 @@ class getClusterStatus_args: oprot.writeStructBegin('getClusterStatus_args') oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1262,18 +1275,19 @@ class getClusterStatus_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('getClusterStatus_result') - if self.success != None: + if self.success is not None: oprot.writeFieldBegin('success', TType.STRUCT, 0) self.success.write(oprot) oprot.writeFieldEnd() - if self.ex != None: + if self.ex is not None: oprot.writeFieldBegin('ex', TType.STRUCT, 1) self.ex.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1313,8 +1327,9 @@ class getQueryPlan_args: oprot.writeStructBegin('getQueryPlan_args') oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1375,18 +1390,19 @@ class getQueryPlan_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('getQueryPlan_result') - if self.success != None: + if self.success is not None: oprot.writeFieldBegin('success', TType.STRUCT, 0) self.success.write(oprot) oprot.writeFieldEnd() - if self.ex != None: + if self.ex is not None: oprot.writeFieldBegin('ex', TType.STRUCT, 1) self.ex.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1426,8 +1442,9 @@ class clean_args: oprot.writeStructBegin('clean_args') oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -1467,8 +1484,9 @@ class clean_result: oprot.writeStructBegin('clean_result') oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): Modified: hive/trunk/service/src/gen/thrift/gen-py/hive_service/constants.py URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-py/hive_service/constants.py?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-py/hive_service/constants.py (original) +++ hive/trunk/service/src/gen/thrift/gen-py/hive_service/constants.py Mon Sep 5 08:47:02 2011 @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift +# Autogenerated by Thrift Compiler (0.7.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # Modified: hive/trunk/service/src/gen/thrift/gen-py/hive_service/ttypes.py URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-py/hive_service/ttypes.py?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-py/hive_service/ttypes.py (original) +++ hive/trunk/service/src/gen/thrift/gen-py/hive_service/ttypes.py Mon Sep 5 08:47:02 2011 @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift +# Autogenerated by Thrift Compiler (0.7.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -111,34 +111,35 @@ class HiveClusterStatus: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('HiveClusterStatus') - if self.taskTrackers != None: + if self.taskTrackers is not None: oprot.writeFieldBegin('taskTrackers', TType.I32, 1) oprot.writeI32(self.taskTrackers) oprot.writeFieldEnd() - if self.mapTasks != None: + if self.mapTasks is not None: oprot.writeFieldBegin('mapTasks', TType.I32, 2) oprot.writeI32(self.mapTasks) oprot.writeFieldEnd() - if self.reduceTasks != None: + if self.reduceTasks is not None: oprot.writeFieldBegin('reduceTasks', TType.I32, 3) oprot.writeI32(self.reduceTasks) oprot.writeFieldEnd() - if self.maxMapTasks != None: + if self.maxMapTasks is not None: oprot.writeFieldBegin('maxMapTasks', TType.I32, 4) oprot.writeI32(self.maxMapTasks) oprot.writeFieldEnd() - if self.maxReduceTasks != None: + if self.maxReduceTasks is not None: oprot.writeFieldBegin('maxReduceTasks', TType.I32, 5) oprot.writeI32(self.maxReduceTasks) oprot.writeFieldEnd() - if self.state != None: + if self.state is not None: oprot.writeFieldBegin('state', TType.I32, 6) oprot.writeI32(self.state) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __repr__(self): @@ -206,22 +207,23 @@ class HiveServerException(Exception): oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('HiveServerException') - if self.message != None: + if self.message is not None: oprot.writeFieldBegin('message', TType.STRING, 1) oprot.writeString(self.message) oprot.writeFieldEnd() - if self.errorCode != None: + if self.errorCode is not None: oprot.writeFieldBegin('errorCode', TType.I32, 2) oprot.writeI32(self.errorCode) oprot.writeFieldEnd() - if self.SQLState != None: + if self.SQLState is not None: oprot.writeFieldBegin('SQLState', TType.STRING, 3) oprot.writeString(self.SQLState) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() - def validate(self): - return + + def validate(self): + return def __str__(self): Modified: hive/trunk/service/src/gen/thrift/gen-rb/hive_service_constants.rb URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-rb/hive_service_constants.rb?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-rb/hive_service_constants.rb (original) +++ hive/trunk/service/src/gen/thrift/gen-rb/hive_service_constants.rb Mon Sep 5 08:47:02 2011 @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift +# Autogenerated by Thrift Compiler (0.7.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # Modified: hive/trunk/service/src/gen/thrift/gen-rb/hive_service_types.rb URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-rb/hive_service_types.rb?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-rb/hive_service_types.rb (original) +++ hive/trunk/service/src/gen/thrift/gen-rb/hive_service_types.rb Mon Sep 5 08:47:02 2011 @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift +# Autogenerated by Thrift Compiler (0.7.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # Modified: hive/trunk/service/src/gen/thrift/gen-rb/thrift_hive.rb URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-rb/thrift_hive.rb?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/gen/thrift/gen-rb/thrift_hive.rb (original) +++ hive/trunk/service/src/gen/thrift/gen-rb/thrift_hive.rb Mon Sep 5 08:47:02 2011 @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift +# Autogenerated by Thrift Compiler (0.7.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # Modified: hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java URL: http://svn.apache.org/viewvc/hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java (original) +++ hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java Mon Sep 5 08:47:02 2011 @@ -672,12 +672,14 @@ public class HiveServer extends ThriftHi ThriftHiveProcessorFactory hfactory = new ThriftHiveProcessorFactory(null, conf); - TThreadPoolServer.Options options = new TThreadPoolServer.Options(); - options.minWorkerThreads = cli.minWorkerThreads; - options.maxWorkerThreads = cli.maxWorkerThreads; - TServer server = new TThreadPoolServer(hfactory, serverTransport, - new TTransportFactory(), new TTransportFactory(), - new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(), options); + TThreadPoolServer.Args sargs = new TThreadPoolServer.Args(serverTransport) + .processorFactory(hfactory) + .transportFactory(new TTransportFactory()) + .protocolFactory(new TBinaryProtocol.Factory()) + .minWorkerThreads(cli.minWorkerThreads) + .maxWorkerThreads(cli.maxWorkerThreads); + + TServer server = new TThreadPoolServer(sargs); String msg = "Starting hive server on port " + cli.port + " with " + cli.minWorkerThreads + " min worker threads and " Modified: hive/trunk/shims/ivy.xml URL: http://svn.apache.org/viewvc/hive/trunk/shims/ivy.xml?rev=1165207&r1=1165206&r2=1165207&view=diff ============================================================================== --- hive/trunk/shims/ivy.xml (original) +++ hive/trunk/shims/ivy.xml Mon Sep 5 08:47:02 2011 @@ -29,7 +29,9 @@ </dependency> <dependency org="hadoop" name="core" rev="${hadoop.security.version}"> <artifact name="hadoop" type="source" ext="tar.gz"/> - </dependency> + </dependency> + <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}" + transitive="false"/> <conflict manager="all" /> </dependencies> </ivy-module>
