Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 094CBDFBD for ; Thu, 8 Nov 2012 09:45:16 +0000 (UTC) Received: (qmail 23496 invoked by uid 500); 8 Nov 2012 09:45:15 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 23276 invoked by uid 500); 8 Nov 2012 09:45:14 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 23083 invoked by uid 99); 8 Nov 2012 09:45:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 09:45:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 09:45:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 765292388AA9 for ; Thu, 8 Nov 2012 09:44:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1406984 [3/29] - in /hive/trunk: contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/ contrib/src/java/org/apache/hadoop/hive/contrib/serde2/ contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/ contrib/src/test/... Date: Thu, 08 Nov 2012 09:44:29 -0000 To: commits@hive.apache.org From: hashutosh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121108094446.765292388AA9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h?rev=1406984&r1=1406983&r2=1406984&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h (original) +++ hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h Thu Nov 8 09:44:19 2012 @@ -1,18 +1,19 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated */ #ifndef ThriftHiveMetastore_H #define ThriftHiveMetastore_H -#include +#include #include "hive_metastore_types.h" #include "FacebookService.h" namespace Apache { namespace Hadoop { namespace Hive { -class ThriftHiveMetastoreIf : virtual public facebook::fb303::FacebookServiceIf { +class ThriftHiveMetastoreIf : virtual public ::facebook::fb303::FacebookServiceIf { public: virtual ~ThriftHiveMetastoreIf() {} virtual void create_database(const Database& database) = 0; @@ -92,7 +93,31 @@ class ThriftHiveMetastoreIf : virtual pu virtual void cancel_delegation_token(const std::string& token_str_form) = 0; }; -class ThriftHiveMetastoreNull : virtual public ThriftHiveMetastoreIf , virtual public facebook::fb303::FacebookServiceNull { +class ThriftHiveMetastoreIfFactory : virtual public ::facebook::fb303::FacebookServiceIfFactory { + public: + typedef ThriftHiveMetastoreIf Handler; + + virtual ~ThriftHiveMetastoreIfFactory() {} + + virtual ThriftHiveMetastoreIf* getHandler(const ::apache::thrift::TConnectionInfo& connInfo) = 0; + virtual void releaseHandler( ::facebook::fb303::FacebookServiceIf* /* handler */) = 0; +}; + +class ThriftHiveMetastoreIfSingletonFactory : virtual public ThriftHiveMetastoreIfFactory { + public: + ThriftHiveMetastoreIfSingletonFactory(const boost::shared_ptr& iface) : iface_(iface) {} + virtual ~ThriftHiveMetastoreIfSingletonFactory() {} + + virtual ThriftHiveMetastoreIf* getHandler(const ::apache::thrift::TConnectionInfo&) { + return iface_.get(); + } + virtual void releaseHandler( ::facebook::fb303::FacebookServiceIf* /* handler */) {} + + protected: + boost::shared_ptr iface_; +}; + +class ThriftHiveMetastoreNull : virtual public ThriftHiveMetastoreIf , virtual public ::facebook::fb303::FacebookServiceNull { public: virtual ~ThriftHiveMetastoreNull() {} void create_database(const Database& /* database */) { @@ -476,7 +501,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_database_args { public: - ThriftHiveMetastore_get_database_args() : name("") { + ThriftHiveMetastore_get_database_args() : name() { } virtual ~ThriftHiveMetastore_get_database_args() throw() {} @@ -606,7 +631,7 @@ typedef struct _ThriftHiveMetastore_drop class ThriftHiveMetastore_drop_database_args { public: - ThriftHiveMetastore_drop_database_args() : name(""), deleteData(0), cascade(0) { + ThriftHiveMetastore_drop_database_args() : name(), deleteData(0), cascade(0) { } virtual ~ThriftHiveMetastore_drop_database_args() throw() {} @@ -750,7 +775,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_databases_args { public: - ThriftHiveMetastore_get_databases_args() : pattern("") { + ThriftHiveMetastore_get_databases_args() : pattern() { } virtual ~ThriftHiveMetastore_get_databases_args() throw() {} @@ -973,7 +998,7 @@ typedef struct _ThriftHiveMetastore_alte class ThriftHiveMetastore_alter_database_args { public: - ThriftHiveMetastore_alter_database_args() : dbname("") { + ThriftHiveMetastore_alter_database_args() : dbname() { } virtual ~ThriftHiveMetastore_alter_database_args() throw() {} @@ -1099,7 +1124,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_type_args { public: - ThriftHiveMetastore_get_type_args() : name("") { + ThriftHiveMetastore_get_type_args() : name() { } virtual ~ThriftHiveMetastore_get_type_args() throw() {} @@ -1365,7 +1390,7 @@ typedef struct _ThriftHiveMetastore_drop class ThriftHiveMetastore_drop_type_args { public: - ThriftHiveMetastore_drop_type_args() : type("") { + ThriftHiveMetastore_drop_type_args() : type() { } virtual ~ThriftHiveMetastore_drop_type_args() throw() {} @@ -1493,7 +1518,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_type_all_args { public: - ThriftHiveMetastore_get_type_all_args() : name("") { + ThriftHiveMetastore_get_type_all_args() : name() { } virtual ~ThriftHiveMetastore_get_type_all_args() throw() {} @@ -1612,7 +1637,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_fields_args { public: - ThriftHiveMetastore_get_fields_args() : db_name(""), table_name("") { + ThriftHiveMetastore_get_fields_args() : db_name(), table_name() { } virtual ~ThriftHiveMetastore_get_fields_args() throw() {} @@ -1759,7 +1784,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_schema_args { public: - ThriftHiveMetastore_get_schema_args() : db_name(""), table_name("") { + ThriftHiveMetastore_get_schema_args() : db_name(), table_name() { } virtual ~ThriftHiveMetastore_get_schema_args() throw() {} @@ -2192,7 +2217,7 @@ typedef struct _ThriftHiveMetastore_drop class ThriftHiveMetastore_drop_table_args { public: - ThriftHiveMetastore_drop_table_args() : dbname(""), name(""), deleteData(0) { + ThriftHiveMetastore_drop_table_args() : dbname(), name(), deleteData(0) { } virtual ~ThriftHiveMetastore_drop_table_args() throw() {} @@ -2327,7 +2352,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_tables_args { public: - ThriftHiveMetastore_get_tables_args() : db_name(""), pattern("") { + ThriftHiveMetastore_get_tables_args() : db_name(), pattern() { } virtual ~ThriftHiveMetastore_get_tables_args() throw() {} @@ -2453,7 +2478,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_all_tables_args { public: - ThriftHiveMetastore_get_all_tables_args() : db_name("") { + ThriftHiveMetastore_get_all_tables_args() : db_name() { } virtual ~ThriftHiveMetastore_get_all_tables_args() throw() {} @@ -2572,7 +2597,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_table_args { public: - ThriftHiveMetastore_get_table_args() : dbname(""), tbl_name("") { + ThriftHiveMetastore_get_table_args() : dbname(), tbl_name() { } virtual ~ThriftHiveMetastore_get_table_args() throw() {} @@ -2709,7 +2734,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_table_objects_by_name_args { public: - ThriftHiveMetastore_get_table_objects_by_name_args() : dbname("") { + ThriftHiveMetastore_get_table_objects_by_name_args() : dbname() { } virtual ~ThriftHiveMetastore_get_table_objects_by_name_args() throw() {} @@ -2848,7 +2873,7 @@ class ThriftHiveMetastore_get_table_obje }; typedef struct _ThriftHiveMetastore_get_table_names_by_filter_args__isset { - _ThriftHiveMetastore_get_table_names_by_filter_args__isset() : dbname(false), filter(false), max_tables(false) {} + _ThriftHiveMetastore_get_table_names_by_filter_args__isset() : dbname(false), filter(false), max_tables(true) {} bool dbname; bool filter; bool max_tables; @@ -2857,7 +2882,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_table_names_by_filter_args { public: - ThriftHiveMetastore_get_table_names_by_filter_args() : dbname(""), filter(""), max_tables(-1) { + ThriftHiveMetastore_get_table_names_by_filter_args() : dbname(), filter(), max_tables(-1) { } virtual ~ThriftHiveMetastore_get_table_names_by_filter_args() throw() {} @@ -3013,7 +3038,7 @@ typedef struct _ThriftHiveMetastore_alte class ThriftHiveMetastore_alter_table_args { public: - ThriftHiveMetastore_alter_table_args() : dbname(""), tbl_name("") { + ThriftHiveMetastore_alter_table_args() : dbname(), tbl_name() { } virtual ~ThriftHiveMetastore_alter_table_args() throw() {} @@ -3150,7 +3175,7 @@ typedef struct _ThriftHiveMetastore_alte class ThriftHiveMetastore_alter_table_with_environment_context_args { public: - ThriftHiveMetastore_alter_table_with_environment_context_args() : dbname(""), tbl_name("") { + ThriftHiveMetastore_alter_table_with_environment_context_args() : dbname(), tbl_name() { } virtual ~ThriftHiveMetastore_alter_table_with_environment_context_args() throw() {} @@ -3717,7 +3742,7 @@ typedef struct _ThriftHiveMetastore_appe class ThriftHiveMetastore_append_partition_args { public: - ThriftHiveMetastore_append_partition_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_append_partition_args() : db_name(), tbl_name() { } virtual ~ThriftHiveMetastore_append_partition_args() throw() {} @@ -3873,7 +3898,7 @@ typedef struct _ThriftHiveMetastore_appe class ThriftHiveMetastore_append_partition_by_name_args { public: - ThriftHiveMetastore_append_partition_by_name_args() : db_name(""), tbl_name(""), part_name("") { + ThriftHiveMetastore_append_partition_by_name_args() : db_name(), tbl_name(), part_name() { } virtual ~ThriftHiveMetastore_append_partition_by_name_args() throw() {} @@ -4030,7 +4055,7 @@ typedef struct _ThriftHiveMetastore_drop class ThriftHiveMetastore_drop_partition_args { public: - ThriftHiveMetastore_drop_partition_args() : db_name(""), tbl_name(""), deleteData(0) { + ThriftHiveMetastore_drop_partition_args() : db_name(), tbl_name(), deleteData(0) { } virtual ~ThriftHiveMetastore_drop_partition_args() throw() {} @@ -4185,7 +4210,7 @@ typedef struct _ThriftHiveMetastore_drop class ThriftHiveMetastore_drop_partition_by_name_args { public: - ThriftHiveMetastore_drop_partition_by_name_args() : db_name(""), tbl_name(""), part_name(""), deleteData(0) { + ThriftHiveMetastore_drop_partition_by_name_args() : db_name(), tbl_name(), part_name(), deleteData(0) { } virtual ~ThriftHiveMetastore_drop_partition_by_name_args() throw() {} @@ -4339,7 +4364,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partition_args { public: - ThriftHiveMetastore_get_partition_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_get_partition_args() : db_name(), tbl_name() { } virtual ~ThriftHiveMetastore_get_partition_args() throw() {} @@ -4487,7 +4512,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partition_with_auth_args { public: - ThriftHiveMetastore_get_partition_with_auth_args() : db_name(""), tbl_name(""), user_name("") { + ThriftHiveMetastore_get_partition_with_auth_args() : db_name(), tbl_name(), user_name() { } virtual ~ThriftHiveMetastore_get_partition_with_auth_args() throw() {} @@ -4649,7 +4674,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partition_by_name_args { public: - ThriftHiveMetastore_get_partition_by_name_args() : db_name(""), tbl_name(""), part_name("") { + ThriftHiveMetastore_get_partition_by_name_args() : db_name(), tbl_name(), part_name() { } virtual ~ThriftHiveMetastore_get_partition_by_name_args() throw() {} @@ -4786,7 +4811,7 @@ class ThriftHiveMetastore_get_partition_ }; typedef struct _ThriftHiveMetastore_get_partitions_args__isset { - _ThriftHiveMetastore_get_partitions_args__isset() : db_name(false), tbl_name(false), max_parts(false) {} + _ThriftHiveMetastore_get_partitions_args__isset() : db_name(false), tbl_name(false), max_parts(true) {} bool db_name; bool tbl_name; bool max_parts; @@ -4795,7 +4820,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partitions_args { public: - ThriftHiveMetastore_get_partitions_args() : db_name(""), tbl_name(""), max_parts(-1) { + ThriftHiveMetastore_get_partitions_args() : db_name(), tbl_name(), max_parts(-1) { } virtual ~ThriftHiveMetastore_get_partitions_args() throw() {} @@ -4932,7 +4957,7 @@ class ThriftHiveMetastore_get_partitions }; typedef struct _ThriftHiveMetastore_get_partitions_with_auth_args__isset { - _ThriftHiveMetastore_get_partitions_with_auth_args__isset() : db_name(false), tbl_name(false), max_parts(false), user_name(false), group_names(false) {} + _ThriftHiveMetastore_get_partitions_with_auth_args__isset() : db_name(false), tbl_name(false), max_parts(true), user_name(false), group_names(false) {} bool db_name; bool tbl_name; bool max_parts; @@ -4943,7 +4968,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partitions_with_auth_args { public: - ThriftHiveMetastore_get_partitions_with_auth_args() : db_name(""), tbl_name(""), max_parts(-1), user_name("") { + ThriftHiveMetastore_get_partitions_with_auth_args() : db_name(), tbl_name(), max_parts(-1), user_name() { } virtual ~ThriftHiveMetastore_get_partitions_with_auth_args() throw() {} @@ -5096,7 +5121,7 @@ class ThriftHiveMetastore_get_partitions }; typedef struct _ThriftHiveMetastore_get_partition_names_args__isset { - _ThriftHiveMetastore_get_partition_names_args__isset() : db_name(false), tbl_name(false), max_parts(false) {} + _ThriftHiveMetastore_get_partition_names_args__isset() : db_name(false), tbl_name(false), max_parts(true) {} bool db_name; bool tbl_name; bool max_parts; @@ -5105,7 +5130,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partition_names_args { public: - ThriftHiveMetastore_get_partition_names_args() : db_name(""), tbl_name(""), max_parts(-1) { + ThriftHiveMetastore_get_partition_names_args() : db_name(), tbl_name(), max_parts(-1) { } virtual ~ThriftHiveMetastore_get_partition_names_args() throw() {} @@ -5232,7 +5257,7 @@ class ThriftHiveMetastore_get_partition_ }; typedef struct _ThriftHiveMetastore_get_partitions_ps_args__isset { - _ThriftHiveMetastore_get_partitions_ps_args__isset() : db_name(false), tbl_name(false), part_vals(false), max_parts(false) {} + _ThriftHiveMetastore_get_partitions_ps_args__isset() : db_name(false), tbl_name(false), part_vals(false), max_parts(true) {} bool db_name; bool tbl_name; bool part_vals; @@ -5242,7 +5267,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partitions_ps_args { public: - ThriftHiveMetastore_get_partitions_ps_args() : db_name(""), tbl_name(""), max_parts(-1) { + ThriftHiveMetastore_get_partitions_ps_args() : db_name(), tbl_name(), max_parts(-1) { } virtual ~ThriftHiveMetastore_get_partitions_ps_args() throw() {} @@ -5387,7 +5412,7 @@ class ThriftHiveMetastore_get_partitions }; typedef struct _ThriftHiveMetastore_get_partitions_ps_with_auth_args__isset { - _ThriftHiveMetastore_get_partitions_ps_with_auth_args__isset() : db_name(false), tbl_name(false), part_vals(false), max_parts(false), user_name(false), group_names(false) {} + _ThriftHiveMetastore_get_partitions_ps_with_auth_args__isset() : db_name(false), tbl_name(false), part_vals(false), max_parts(true), user_name(false), group_names(false) {} bool db_name; bool tbl_name; bool part_vals; @@ -5399,7 +5424,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partitions_ps_with_auth_args { public: - ThriftHiveMetastore_get_partitions_ps_with_auth_args() : db_name(""), tbl_name(""), max_parts(-1), user_name("") { + ThriftHiveMetastore_get_partitions_ps_with_auth_args() : db_name(), tbl_name(), max_parts(-1), user_name() { } virtual ~ThriftHiveMetastore_get_partitions_ps_with_auth_args() throw() {} @@ -5560,7 +5585,7 @@ class ThriftHiveMetastore_get_partitions }; typedef struct _ThriftHiveMetastore_get_partition_names_ps_args__isset { - _ThriftHiveMetastore_get_partition_names_ps_args__isset() : db_name(false), tbl_name(false), part_vals(false), max_parts(false) {} + _ThriftHiveMetastore_get_partition_names_ps_args__isset() : db_name(false), tbl_name(false), part_vals(false), max_parts(true) {} bool db_name; bool tbl_name; bool part_vals; @@ -5570,7 +5595,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partition_names_ps_args { public: - ThriftHiveMetastore_get_partition_names_ps_args() : db_name(""), tbl_name(""), max_parts(-1) { + ThriftHiveMetastore_get_partition_names_ps_args() : db_name(), tbl_name(), max_parts(-1) { } virtual ~ThriftHiveMetastore_get_partition_names_ps_args() throw() {} @@ -5715,7 +5740,7 @@ class ThriftHiveMetastore_get_partition_ }; typedef struct _ThriftHiveMetastore_get_partitions_by_filter_args__isset { - _ThriftHiveMetastore_get_partitions_by_filter_args__isset() : db_name(false), tbl_name(false), filter(false), max_parts(false) {} + _ThriftHiveMetastore_get_partitions_by_filter_args__isset() : db_name(false), tbl_name(false), filter(false), max_parts(true) {} bool db_name; bool tbl_name; bool filter; @@ -5725,7 +5750,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partitions_by_filter_args { public: - ThriftHiveMetastore_get_partitions_by_filter_args() : db_name(""), tbl_name(""), filter(""), max_parts(-1) { + ThriftHiveMetastore_get_partitions_by_filter_args() : db_name(), tbl_name(), filter(), max_parts(-1) { } virtual ~ThriftHiveMetastore_get_partitions_by_filter_args() throw() {} @@ -5879,7 +5904,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partitions_by_names_args { public: - ThriftHiveMetastore_get_partitions_by_names_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_get_partitions_by_names_args() : db_name(), tbl_name() { } virtual ~ThriftHiveMetastore_get_partitions_by_names_args() throw() {} @@ -6025,7 +6050,7 @@ typedef struct _ThriftHiveMetastore_alte class ThriftHiveMetastore_alter_partition_args { public: - ThriftHiveMetastore_alter_partition_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_alter_partition_args() : db_name(), tbl_name() { } virtual ~ThriftHiveMetastore_alter_partition_args() throw() {} @@ -6161,7 +6186,7 @@ typedef struct _ThriftHiveMetastore_alte class ThriftHiveMetastore_alter_partitions_args { public: - ThriftHiveMetastore_alter_partitions_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_alter_partitions_args() : db_name(), tbl_name() { } virtual ~ThriftHiveMetastore_alter_partitions_args() throw() {} @@ -6298,7 +6323,7 @@ typedef struct _ThriftHiveMetastore_alte class ThriftHiveMetastore_alter_partition_with_environment_context_args { public: - ThriftHiveMetastore_alter_partition_with_environment_context_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_alter_partition_with_environment_context_args() : db_name(), tbl_name() { } virtual ~ThriftHiveMetastore_alter_partition_with_environment_context_args() throw() {} @@ -6443,7 +6468,7 @@ typedef struct _ThriftHiveMetastore_rena class ThriftHiveMetastore_rename_partition_args { public: - ThriftHiveMetastore_rename_partition_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_rename_partition_args() : db_name(), tbl_name() { } virtual ~ThriftHiveMetastore_rename_partition_args() throw() {} @@ -6586,7 +6611,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_config_value_args { public: - ThriftHiveMetastore_get_config_value_args() : name(""), defaultValue("") { + ThriftHiveMetastore_get_config_value_args() : name(), defaultValue() { } virtual ~ThriftHiveMetastore_get_config_value_args() throw() {} @@ -6646,7 +6671,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_config_value_result { public: - ThriftHiveMetastore_get_config_value_result() : success("") { + ThriftHiveMetastore_get_config_value_result() : success() { } virtual ~ThriftHiveMetastore_get_config_value_result() throw() {} @@ -6712,7 +6737,7 @@ typedef struct _ThriftHiveMetastore_part class ThriftHiveMetastore_partition_name_to_vals_args { public: - ThriftHiveMetastore_partition_name_to_vals_args() : part_name("") { + ThriftHiveMetastore_partition_name_to_vals_args() : part_name() { } virtual ~ThriftHiveMetastore_partition_name_to_vals_args() throw() {} @@ -6830,7 +6855,7 @@ typedef struct _ThriftHiveMetastore_part class ThriftHiveMetastore_partition_name_to_spec_args { public: - ThriftHiveMetastore_partition_name_to_spec_args() : part_name("") { + ThriftHiveMetastore_partition_name_to_spec_args() : part_name() { } virtual ~ThriftHiveMetastore_partition_name_to_spec_args() throw() {} @@ -6951,7 +6976,7 @@ typedef struct _ThriftHiveMetastore_mark class ThriftHiveMetastore_markPartitionForEvent_args { public: - ThriftHiveMetastore_markPartitionForEvent_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_markPartitionForEvent_args() : db_name(), tbl_name(), eventType((PartitionEventType::type)0) { } virtual ~ThriftHiveMetastore_markPartitionForEvent_args() throw() {} @@ -7136,7 +7161,7 @@ typedef struct _ThriftHiveMetastore_isPa class ThriftHiveMetastore_isPartitionMarkedForEvent_args { public: - ThriftHiveMetastore_isPartitionMarkedForEvent_args() : db_name(""), tbl_name("") { + ThriftHiveMetastore_isPartitionMarkedForEvent_args() : db_name(), tbl_name(), eventType((PartitionEventType::type)0) { } virtual ~ThriftHiveMetastore_isPartitionMarkedForEvent_args() throw() {} @@ -7478,7 +7503,7 @@ typedef struct _ThriftHiveMetastore_alte class ThriftHiveMetastore_alter_index_args { public: - ThriftHiveMetastore_alter_index_args() : dbname(""), base_tbl_name(""), idx_name("") { + ThriftHiveMetastore_alter_index_args() : dbname(), base_tbl_name(), idx_name() { } virtual ~ThriftHiveMetastore_alter_index_args() throw() {} @@ -7623,7 +7648,7 @@ typedef struct _ThriftHiveMetastore_drop class ThriftHiveMetastore_drop_index_by_name_args { public: - ThriftHiveMetastore_drop_index_by_name_args() : db_name(""), tbl_name(""), index_name(""), deleteData(0) { + ThriftHiveMetastore_drop_index_by_name_args() : db_name(), tbl_name(), index_name(), deleteData(0) { } virtual ~ThriftHiveMetastore_drop_index_by_name_args() throw() {} @@ -7777,7 +7802,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_index_by_name_args { public: - ThriftHiveMetastore_get_index_by_name_args() : db_name(""), tbl_name(""), index_name("") { + ThriftHiveMetastore_get_index_by_name_args() : db_name(), tbl_name(), index_name() { } virtual ~ThriftHiveMetastore_get_index_by_name_args() throw() {} @@ -7914,7 +7939,7 @@ class ThriftHiveMetastore_get_index_by_n }; typedef struct _ThriftHiveMetastore_get_indexes_args__isset { - _ThriftHiveMetastore_get_indexes_args__isset() : db_name(false), tbl_name(false), max_indexes(false) {} + _ThriftHiveMetastore_get_indexes_args__isset() : db_name(false), tbl_name(false), max_indexes(true) {} bool db_name; bool tbl_name; bool max_indexes; @@ -7923,7 +7948,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_indexes_args { public: - ThriftHiveMetastore_get_indexes_args() : db_name(""), tbl_name(""), max_indexes(-1) { + ThriftHiveMetastore_get_indexes_args() : db_name(), tbl_name(), max_indexes(-1) { } virtual ~ThriftHiveMetastore_get_indexes_args() throw() {} @@ -8060,7 +8085,7 @@ class ThriftHiveMetastore_get_indexes_pr }; typedef struct _ThriftHiveMetastore_get_index_names_args__isset { - _ThriftHiveMetastore_get_index_names_args__isset() : db_name(false), tbl_name(false), max_indexes(false) {} + _ThriftHiveMetastore_get_index_names_args__isset() : db_name(false), tbl_name(false), max_indexes(true) {} bool db_name; bool tbl_name; bool max_indexes; @@ -8069,7 +8094,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_index_names_args { public: - ThriftHiveMetastore_get_index_names_args() : db_name(""), tbl_name(""), max_indexes(-1) { + ThriftHiveMetastore_get_index_names_args() : db_name(), tbl_name(), max_indexes(-1) { } virtual ~ThriftHiveMetastore_get_index_names_args() throw() {} @@ -8501,7 +8526,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_table_column_statistics_args { public: - ThriftHiveMetastore_get_table_column_statistics_args() : db_name(""), tbl_name(""), col_name("") { + ThriftHiveMetastore_get_table_column_statistics_args() : db_name(), tbl_name(), col_name() { } virtual ~ThriftHiveMetastore_get_table_column_statistics_args() throw() {} @@ -8668,7 +8693,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_partition_column_statistics_args { public: - ThriftHiveMetastore_get_partition_column_statistics_args() : db_name(""), tbl_name(""), part_name(""), col_name("") { + ThriftHiveMetastore_get_partition_column_statistics_args() : db_name(), tbl_name(), part_name(), col_name() { } virtual ~ThriftHiveMetastore_get_partition_column_statistics_args() throw() {} @@ -8843,7 +8868,7 @@ typedef struct _ThriftHiveMetastore_dele class ThriftHiveMetastore_delete_partition_column_statistics_args { public: - ThriftHiveMetastore_delete_partition_column_statistics_args() : db_name(""), tbl_name(""), part_name(""), col_name("") { + ThriftHiveMetastore_delete_partition_column_statistics_args() : db_name(), tbl_name(), part_name(), col_name() { } virtual ~ThriftHiveMetastore_delete_partition_column_statistics_args() throw() {} @@ -9017,7 +9042,7 @@ typedef struct _ThriftHiveMetastore_dele class ThriftHiveMetastore_delete_table_column_statistics_args { public: - ThriftHiveMetastore_delete_table_column_statistics_args() : db_name(""), tbl_name(""), col_name("") { + ThriftHiveMetastore_delete_table_column_statistics_args() : db_name(), tbl_name(), col_name() { } virtual ~ThriftHiveMetastore_delete_table_column_statistics_args() throw() {} @@ -9299,7 +9324,7 @@ typedef struct _ThriftHiveMetastore_drop class ThriftHiveMetastore_drop_role_args { public: - ThriftHiveMetastore_drop_role_args() : role_name("") { + ThriftHiveMetastore_drop_role_args() : role_name() { } virtual ~ThriftHiveMetastore_drop_role_args() throw() {} @@ -9526,7 +9551,7 @@ typedef struct _ThriftHiveMetastore_gran class ThriftHiveMetastore_grant_role_args { public: - ThriftHiveMetastore_grant_role_args() : role_name(""), principal_name(""), grantor(""), grant_option(0) { + ThriftHiveMetastore_grant_role_args() : role_name(), principal_name(), principal_type((PrincipalType::type)0), grantor(), grantorType((PrincipalType::type)0), grant_option(0) { } virtual ~ThriftHiveMetastore_grant_role_args() throw() {} @@ -9686,7 +9711,7 @@ typedef struct _ThriftHiveMetastore_revo class ThriftHiveMetastore_revoke_role_args { public: - ThriftHiveMetastore_revoke_role_args() : role_name(""), principal_name("") { + ThriftHiveMetastore_revoke_role_args() : role_name(), principal_name(), principal_type((PrincipalType::type)0) { } virtual ~ThriftHiveMetastore_revoke_role_args() throw() {} @@ -9821,7 +9846,7 @@ typedef struct _ThriftHiveMetastore_list class ThriftHiveMetastore_list_roles_args { public: - ThriftHiveMetastore_list_roles_args() : principal_name("") { + ThriftHiveMetastore_list_roles_args() : principal_name(), principal_type((PrincipalType::type)0) { } virtual ~ThriftHiveMetastore_list_roles_args() throw() {} @@ -9949,7 +9974,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_privilege_set_args { public: - ThriftHiveMetastore_get_privilege_set_args() : user_name("") { + ThriftHiveMetastore_get_privilege_set_args() : user_name() { } virtual ~ThriftHiveMetastore_get_privilege_set_args() throw() {} @@ -10085,7 +10110,7 @@ typedef struct _ThriftHiveMetastore_list class ThriftHiveMetastore_list_privileges_args { public: - ThriftHiveMetastore_list_privileges_args() : principal_name("") { + ThriftHiveMetastore_list_privileges_args() : principal_name(), principal_type((PrincipalType::type)0) { } virtual ~ThriftHiveMetastore_list_privileges_args() throw() {} @@ -10456,7 +10481,7 @@ typedef struct _ThriftHiveMetastore_set_ class ThriftHiveMetastore_set_ugi_args { public: - ThriftHiveMetastore_set_ugi_args() : user_name("") { + ThriftHiveMetastore_set_ugi_args() : user_name() { } virtual ~ThriftHiveMetastore_set_ugi_args() throw() {} @@ -10583,7 +10608,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_delegation_token_args { public: - ThriftHiveMetastore_get_delegation_token_args() : token_owner(""), renewer_kerberos_principal_name("") { + ThriftHiveMetastore_get_delegation_token_args() : token_owner(), renewer_kerberos_principal_name() { } virtual ~ThriftHiveMetastore_get_delegation_token_args() throw() {} @@ -10643,7 +10668,7 @@ typedef struct _ThriftHiveMetastore_get_ class ThriftHiveMetastore_get_delegation_token_result { public: - ThriftHiveMetastore_get_delegation_token_result() : success("") { + ThriftHiveMetastore_get_delegation_token_result() : success() { } virtual ~ThriftHiveMetastore_get_delegation_token_result() throw() {} @@ -10709,7 +10734,7 @@ typedef struct _ThriftHiveMetastore_rene class ThriftHiveMetastore_renew_delegation_token_args { public: - ThriftHiveMetastore_renew_delegation_token_args() : token_str_form("") { + ThriftHiveMetastore_renew_delegation_token_args() : token_str_form() { } virtual ~ThriftHiveMetastore_renew_delegation_token_args() throw() {} @@ -10827,7 +10852,7 @@ typedef struct _ThriftHiveMetastore_canc class ThriftHiveMetastore_cancel_delegation_token_args { public: - ThriftHiveMetastore_cancel_delegation_token_args() : token_str_form("") { + ThriftHiveMetastore_cancel_delegation_token_args() : token_str_form() { } virtual ~ThriftHiveMetastore_cancel_delegation_token_args() throw() {} @@ -10927,12 +10952,12 @@ class ThriftHiveMetastore_cancel_delegat }; -class ThriftHiveMetastoreClient : virtual public ThriftHiveMetastoreIf, public facebook::fb303::FacebookServiceClient { +class ThriftHiveMetastoreClient : virtual public ThriftHiveMetastoreIf, public ::facebook::fb303::FacebookServiceClient { public: ThriftHiveMetastoreClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) : - facebook::fb303::FacebookServiceClient(prot, prot) {} + ::facebook::fb303::FacebookServiceClient(prot, prot) {} ThriftHiveMetastoreClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) : - facebook::fb303::FacebookServiceClient(iprot, oprot) {} + ::facebook::fb303::FacebookServiceClient(iprot, oprot) {} boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() { return piprot_; } @@ -11166,12 +11191,14 @@ class ThriftHiveMetastoreClient : virtua void recv_cancel_delegation_token(); }; -class ThriftHiveMetastoreProcessor : virtual public ::apache::thrift::TProcessor, public facebook::fb303::FacebookServiceProcessor { +class ThriftHiveMetastoreProcessor : public ::facebook::fb303::FacebookServiceProcessor { protected: boost::shared_ptr iface_; - virtual bool process_fn(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, std::string& fname, int32_t seqid, void* callContext); + virtual bool dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext); private: - std::map processMap_; + typedef void (ThriftHiveMetastoreProcessor::*ProcessFunction)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*); + typedef std::map ProcessMap; + ProcessMap processMap_; void process_create_database(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_get_database(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_drop_database(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); @@ -11249,7 +11276,7 @@ class ThriftHiveMetastoreProcessor : vir void process_cancel_delegation_token(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); public: ThriftHiveMetastoreProcessor(boost::shared_ptr iface) : - facebook::fb303::FacebookServiceProcessor(iface), + ::facebook::fb303::FacebookServiceProcessor(iface), iface_(iface) { processMap_["create_database"] = &ThriftHiveMetastoreProcessor::process_create_database; processMap_["get_database"] = &ThriftHiveMetastoreProcessor::process_get_database; @@ -11328,16 +11355,26 @@ class ThriftHiveMetastoreProcessor : vir processMap_["cancel_delegation_token"] = &ThriftHiveMetastoreProcessor::process_cancel_delegation_token; } - virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* callContext); virtual ~ThriftHiveMetastoreProcessor() {} }; -class ThriftHiveMetastoreMultiface : virtual public ThriftHiveMetastoreIf, public facebook::fb303::FacebookServiceMultiface { +class ThriftHiveMetastoreProcessorFactory : public ::apache::thrift::TProcessorFactory { + public: + ThriftHiveMetastoreProcessorFactory(const ::boost::shared_ptr< ThriftHiveMetastoreIfFactory >& handlerFactory) : + handlerFactory_(handlerFactory) {} + + ::boost::shared_ptr< ::apache::thrift::TProcessor > getProcessor(const ::apache::thrift::TConnectionInfo& connInfo); + + protected: + ::boost::shared_ptr< ThriftHiveMetastoreIfFactory > handlerFactory_; +}; + +class ThriftHiveMetastoreMultiface : virtual public ThriftHiveMetastoreIf, public ::facebook::fb303::FacebookServiceMultiface { public: ThriftHiveMetastoreMultiface(std::vector >& ifaces) : ifaces_(ifaces) { std::vector >::iterator iter; for (iter = ifaces.begin(); iter != ifaces.end(); ++iter) { - facebook::fb303::FacebookServiceMultiface::add(*iter); + ::facebook::fb303::FacebookServiceMultiface::add(*iter); } } virtual ~ThriftHiveMetastoreMultiface() {} @@ -11345,815 +11382,725 @@ class ThriftHiveMetastoreMultiface : vir std::vector > ifaces_; ThriftHiveMetastoreMultiface() {} void add(boost::shared_ptr iface) { - facebook::fb303::FacebookServiceMultiface::add(iface); + ::facebook::fb303::FacebookServiceMultiface::add(iface); ifaces_.push_back(iface); } public: void create_database(const Database& database) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->create_database(database); } + ifaces_[i]->create_database(database); } void get_database(Database& _return, const std::string& name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_database(_return, name); - return; - } else { - ifaces_[i]->get_database(_return, name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_database(_return, name); } + ifaces_[i]->get_database(_return, name); + return; } void drop_database(const std::string& name, const bool deleteData, const bool cascade) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->drop_database(name, deleteData, cascade); } + ifaces_[i]->drop_database(name, deleteData, cascade); } void get_databases(std::vector & _return, const std::string& pattern) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_databases(_return, pattern); - return; - } else { - ifaces_[i]->get_databases(_return, pattern); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_databases(_return, pattern); } + ifaces_[i]->get_databases(_return, pattern); + return; } void get_all_databases(std::vector & _return) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_all_databases(_return); - return; - } else { - ifaces_[i]->get_all_databases(_return); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_all_databases(_return); } + ifaces_[i]->get_all_databases(_return); + return; } void alter_database(const std::string& dbname, const Database& db) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->alter_database(dbname, db); } + ifaces_[i]->alter_database(dbname, db); } void get_type(Type& _return, const std::string& name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_type(_return, name); - return; - } else { - ifaces_[i]->get_type(_return, name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_type(_return, name); } + ifaces_[i]->get_type(_return, name); + return; } bool create_type(const Type& type) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->create_type(type); - } else { - ifaces_[i]->create_type(type); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->create_type(type); } + return ifaces_[i]->create_type(type); } bool drop_type(const std::string& type) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->drop_type(type); - } else { - ifaces_[i]->drop_type(type); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->drop_type(type); } + return ifaces_[i]->drop_type(type); } void get_type_all(std::map & _return, const std::string& name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_type_all(_return, name); - return; - } else { - ifaces_[i]->get_type_all(_return, name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_type_all(_return, name); } + ifaces_[i]->get_type_all(_return, name); + return; } void get_fields(std::vector & _return, const std::string& db_name, const std::string& table_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_fields(_return, db_name, table_name); - return; - } else { - ifaces_[i]->get_fields(_return, db_name, table_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_fields(_return, db_name, table_name); } + ifaces_[i]->get_fields(_return, db_name, table_name); + return; } void get_schema(std::vector & _return, const std::string& db_name, const std::string& table_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_schema(_return, db_name, table_name); - return; - } else { - ifaces_[i]->get_schema(_return, db_name, table_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_schema(_return, db_name, table_name); } + ifaces_[i]->get_schema(_return, db_name, table_name); + return; } void create_table(const Table& tbl) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->create_table(tbl); } + ifaces_[i]->create_table(tbl); } void create_table_with_environment_context(const Table& tbl, const EnvironmentContext& environment_context) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->create_table_with_environment_context(tbl, environment_context); } + ifaces_[i]->create_table_with_environment_context(tbl, environment_context); } void drop_table(const std::string& dbname, const std::string& name, const bool deleteData) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->drop_table(dbname, name, deleteData); } + ifaces_[i]->drop_table(dbname, name, deleteData); } void get_tables(std::vector & _return, const std::string& db_name, const std::string& pattern) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_tables(_return, db_name, pattern); - return; - } else { - ifaces_[i]->get_tables(_return, db_name, pattern); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_tables(_return, db_name, pattern); } + ifaces_[i]->get_tables(_return, db_name, pattern); + return; } void get_all_tables(std::vector & _return, const std::string& db_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_all_tables(_return, db_name); - return; - } else { - ifaces_[i]->get_all_tables(_return, db_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_all_tables(_return, db_name); } + ifaces_[i]->get_all_tables(_return, db_name); + return; } void get_table(Table& _return, const std::string& dbname, const std::string& tbl_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_table(_return, dbname, tbl_name); - return; - } else { - ifaces_[i]->get_table(_return, dbname, tbl_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_table(_return, dbname, tbl_name); } + ifaces_[i]->get_table(_return, dbname, tbl_name); + return; } void get_table_objects_by_name(std::vector & _return, const std::string& dbname, const std::vector & tbl_names) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_table_objects_by_name(_return, dbname, tbl_names); - return; - } else { - ifaces_[i]->get_table_objects_by_name(_return, dbname, tbl_names); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_table_objects_by_name(_return, dbname, tbl_names); } + ifaces_[i]->get_table_objects_by_name(_return, dbname, tbl_names); + return; } void get_table_names_by_filter(std::vector & _return, const std::string& dbname, const std::string& filter, const int16_t max_tables) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_table_names_by_filter(_return, dbname, filter, max_tables); - return; - } else { - ifaces_[i]->get_table_names_by_filter(_return, dbname, filter, max_tables); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_table_names_by_filter(_return, dbname, filter, max_tables); } + ifaces_[i]->get_table_names_by_filter(_return, dbname, filter, max_tables); + return; } void alter_table(const std::string& dbname, const std::string& tbl_name, const Table& new_tbl) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->alter_table(dbname, tbl_name, new_tbl); } + ifaces_[i]->alter_table(dbname, tbl_name, new_tbl); } void alter_table_with_environment_context(const std::string& dbname, const std::string& tbl_name, const Table& new_tbl, const EnvironmentContext& environment_context) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->alter_table_with_environment_context(dbname, tbl_name, new_tbl, environment_context); } + ifaces_[i]->alter_table_with_environment_context(dbname, tbl_name, new_tbl, environment_context); } void add_partition(Partition& _return, const Partition& new_part) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->add_partition(_return, new_part); - return; - } else { - ifaces_[i]->add_partition(_return, new_part); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->add_partition(_return, new_part); } + ifaces_[i]->add_partition(_return, new_part); + return; } void add_partition_with_environment_context(Partition& _return, const Partition& new_part, const EnvironmentContext& environment_context) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->add_partition_with_environment_context(_return, new_part, environment_context); - return; - } else { - ifaces_[i]->add_partition_with_environment_context(_return, new_part, environment_context); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->add_partition_with_environment_context(_return, new_part, environment_context); } + ifaces_[i]->add_partition_with_environment_context(_return, new_part, environment_context); + return; } int32_t add_partitions(const std::vector & new_parts) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->add_partitions(new_parts); - } else { - ifaces_[i]->add_partitions(new_parts); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->add_partitions(new_parts); } + return ifaces_[i]->add_partitions(new_parts); } void append_partition(Partition& _return, const std::string& db_name, const std::string& tbl_name, const std::vector & part_vals) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->append_partition(_return, db_name, tbl_name, part_vals); - return; - } else { - ifaces_[i]->append_partition(_return, db_name, tbl_name, part_vals); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->append_partition(_return, db_name, tbl_name, part_vals); } + ifaces_[i]->append_partition(_return, db_name, tbl_name, part_vals); + return; } void append_partition_by_name(Partition& _return, const std::string& db_name, const std::string& tbl_name, const std::string& part_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->append_partition_by_name(_return, db_name, tbl_name, part_name); - return; - } else { - ifaces_[i]->append_partition_by_name(_return, db_name, tbl_name, part_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->append_partition_by_name(_return, db_name, tbl_name, part_name); } + ifaces_[i]->append_partition_by_name(_return, db_name, tbl_name, part_name); + return; } bool drop_partition(const std::string& db_name, const std::string& tbl_name, const std::vector & part_vals, const bool deleteData) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->drop_partition(db_name, tbl_name, part_vals, deleteData); - } else { - ifaces_[i]->drop_partition(db_name, tbl_name, part_vals, deleteData); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->drop_partition(db_name, tbl_name, part_vals, deleteData); } + return ifaces_[i]->drop_partition(db_name, tbl_name, part_vals, deleteData); } bool drop_partition_by_name(const std::string& db_name, const std::string& tbl_name, const std::string& part_name, const bool deleteData) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->drop_partition_by_name(db_name, tbl_name, part_name, deleteData); - } else { - ifaces_[i]->drop_partition_by_name(db_name, tbl_name, part_name, deleteData); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->drop_partition_by_name(db_name, tbl_name, part_name, deleteData); } + return ifaces_[i]->drop_partition_by_name(db_name, tbl_name, part_name, deleteData); } void get_partition(Partition& _return, const std::string& db_name, const std::string& tbl_name, const std::vector & part_vals) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partition(_return, db_name, tbl_name, part_vals); - return; - } else { - ifaces_[i]->get_partition(_return, db_name, tbl_name, part_vals); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partition(_return, db_name, tbl_name, part_vals); } + ifaces_[i]->get_partition(_return, db_name, tbl_name, part_vals); + return; } void get_partition_with_auth(Partition& _return, const std::string& db_name, const std::string& tbl_name, const std::vector & part_vals, const std::string& user_name, const std::vector & group_names) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partition_with_auth(_return, db_name, tbl_name, part_vals, user_name, group_names); - return; - } else { - ifaces_[i]->get_partition_with_auth(_return, db_name, tbl_name, part_vals, user_name, group_names); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partition_with_auth(_return, db_name, tbl_name, part_vals, user_name, group_names); } + ifaces_[i]->get_partition_with_auth(_return, db_name, tbl_name, part_vals, user_name, group_names); + return; } void get_partition_by_name(Partition& _return, const std::string& db_name, const std::string& tbl_name, const std::string& part_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partition_by_name(_return, db_name, tbl_name, part_name); - return; - } else { - ifaces_[i]->get_partition_by_name(_return, db_name, tbl_name, part_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partition_by_name(_return, db_name, tbl_name, part_name); } + ifaces_[i]->get_partition_by_name(_return, db_name, tbl_name, part_name); + return; } void get_partitions(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const int16_t max_parts) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partitions(_return, db_name, tbl_name, max_parts); - return; - } else { - ifaces_[i]->get_partitions(_return, db_name, tbl_name, max_parts); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partitions(_return, db_name, tbl_name, max_parts); } + ifaces_[i]->get_partitions(_return, db_name, tbl_name, max_parts); + return; } void get_partitions_with_auth(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const int16_t max_parts, const std::string& user_name, const std::vector & group_names) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partitions_with_auth(_return, db_name, tbl_name, max_parts, user_name, group_names); - return; - } else { - ifaces_[i]->get_partitions_with_auth(_return, db_name, tbl_name, max_parts, user_name, group_names); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partitions_with_auth(_return, db_name, tbl_name, max_parts, user_name, group_names); } + ifaces_[i]->get_partitions_with_auth(_return, db_name, tbl_name, max_parts, user_name, group_names); + return; } void get_partition_names(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const int16_t max_parts) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partition_names(_return, db_name, tbl_name, max_parts); - return; - } else { - ifaces_[i]->get_partition_names(_return, db_name, tbl_name, max_parts); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partition_names(_return, db_name, tbl_name, max_parts); } + ifaces_[i]->get_partition_names(_return, db_name, tbl_name, max_parts); + return; } void get_partitions_ps(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const std::vector & part_vals, const int16_t max_parts) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partitions_ps(_return, db_name, tbl_name, part_vals, max_parts); - return; - } else { - ifaces_[i]->get_partitions_ps(_return, db_name, tbl_name, part_vals, max_parts); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partitions_ps(_return, db_name, tbl_name, part_vals, max_parts); } + ifaces_[i]->get_partitions_ps(_return, db_name, tbl_name, part_vals, max_parts); + return; } void get_partitions_ps_with_auth(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const std::vector & part_vals, const int16_t max_parts, const std::string& user_name, const std::vector & group_names) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partitions_ps_with_auth(_return, db_name, tbl_name, part_vals, max_parts, user_name, group_names); - return; - } else { - ifaces_[i]->get_partitions_ps_with_auth(_return, db_name, tbl_name, part_vals, max_parts, user_name, group_names); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partitions_ps_with_auth(_return, db_name, tbl_name, part_vals, max_parts, user_name, group_names); } + ifaces_[i]->get_partitions_ps_with_auth(_return, db_name, tbl_name, part_vals, max_parts, user_name, group_names); + return; } void get_partition_names_ps(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const std::vector & part_vals, const int16_t max_parts) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partition_names_ps(_return, db_name, tbl_name, part_vals, max_parts); - return; - } else { - ifaces_[i]->get_partition_names_ps(_return, db_name, tbl_name, part_vals, max_parts); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partition_names_ps(_return, db_name, tbl_name, part_vals, max_parts); } + ifaces_[i]->get_partition_names_ps(_return, db_name, tbl_name, part_vals, max_parts); + return; } void get_partitions_by_filter(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const std::string& filter, const int16_t max_parts) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partitions_by_filter(_return, db_name, tbl_name, filter, max_parts); - return; - } else { - ifaces_[i]->get_partitions_by_filter(_return, db_name, tbl_name, filter, max_parts); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partitions_by_filter(_return, db_name, tbl_name, filter, max_parts); } + ifaces_[i]->get_partitions_by_filter(_return, db_name, tbl_name, filter, max_parts); + return; } void get_partitions_by_names(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const std::vector & names) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partitions_by_names(_return, db_name, tbl_name, names); - return; - } else { - ifaces_[i]->get_partitions_by_names(_return, db_name, tbl_name, names); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partitions_by_names(_return, db_name, tbl_name, names); } + ifaces_[i]->get_partitions_by_names(_return, db_name, tbl_name, names); + return; } void alter_partition(const std::string& db_name, const std::string& tbl_name, const Partition& new_part) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->alter_partition(db_name, tbl_name, new_part); } + ifaces_[i]->alter_partition(db_name, tbl_name, new_part); } void alter_partitions(const std::string& db_name, const std::string& tbl_name, const std::vector & new_parts) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->alter_partitions(db_name, tbl_name, new_parts); } + ifaces_[i]->alter_partitions(db_name, tbl_name, new_parts); } void alter_partition_with_environment_context(const std::string& db_name, const std::string& tbl_name, const Partition& new_part, const EnvironmentContext& environment_context) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->alter_partition_with_environment_context(db_name, tbl_name, new_part, environment_context); } + ifaces_[i]->alter_partition_with_environment_context(db_name, tbl_name, new_part, environment_context); } void rename_partition(const std::string& db_name, const std::string& tbl_name, const std::vector & part_vals, const Partition& new_part) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->rename_partition(db_name, tbl_name, part_vals, new_part); } + ifaces_[i]->rename_partition(db_name, tbl_name, part_vals, new_part); } void get_config_value(std::string& _return, const std::string& name, const std::string& defaultValue) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_config_value(_return, name, defaultValue); - return; - } else { - ifaces_[i]->get_config_value(_return, name, defaultValue); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_config_value(_return, name, defaultValue); } + ifaces_[i]->get_config_value(_return, name, defaultValue); + return; } void partition_name_to_vals(std::vector & _return, const std::string& part_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->partition_name_to_vals(_return, part_name); - return; - } else { - ifaces_[i]->partition_name_to_vals(_return, part_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->partition_name_to_vals(_return, part_name); } + ifaces_[i]->partition_name_to_vals(_return, part_name); + return; } void partition_name_to_spec(std::map & _return, const std::string& part_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->partition_name_to_spec(_return, part_name); - return; - } else { - ifaces_[i]->partition_name_to_spec(_return, part_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->partition_name_to_spec(_return, part_name); } + ifaces_[i]->partition_name_to_spec(_return, part_name); + return; } void markPartitionForEvent(const std::string& db_name, const std::string& tbl_name, const std::map & part_vals, const PartitionEventType::type eventType) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->markPartitionForEvent(db_name, tbl_name, part_vals, eventType); } + ifaces_[i]->markPartitionForEvent(db_name, tbl_name, part_vals, eventType); } bool isPartitionMarkedForEvent(const std::string& db_name, const std::string& tbl_name, const std::map & part_vals, const PartitionEventType::type eventType) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->isPartitionMarkedForEvent(db_name, tbl_name, part_vals, eventType); - } else { - ifaces_[i]->isPartitionMarkedForEvent(db_name, tbl_name, part_vals, eventType); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->isPartitionMarkedForEvent(db_name, tbl_name, part_vals, eventType); } + return ifaces_[i]->isPartitionMarkedForEvent(db_name, tbl_name, part_vals, eventType); } void add_index(Index& _return, const Index& new_index, const Table& index_table) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->add_index(_return, new_index, index_table); - return; - } else { - ifaces_[i]->add_index(_return, new_index, index_table); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->add_index(_return, new_index, index_table); } + ifaces_[i]->add_index(_return, new_index, index_table); + return; } void alter_index(const std::string& dbname, const std::string& base_tbl_name, const std::string& idx_name, const Index& new_idx) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->alter_index(dbname, base_tbl_name, idx_name, new_idx); } + ifaces_[i]->alter_index(dbname, base_tbl_name, idx_name, new_idx); } bool drop_index_by_name(const std::string& db_name, const std::string& tbl_name, const std::string& index_name, const bool deleteData) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->drop_index_by_name(db_name, tbl_name, index_name, deleteData); - } else { - ifaces_[i]->drop_index_by_name(db_name, tbl_name, index_name, deleteData); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->drop_index_by_name(db_name, tbl_name, index_name, deleteData); } + return ifaces_[i]->drop_index_by_name(db_name, tbl_name, index_name, deleteData); } void get_index_by_name(Index& _return, const std::string& db_name, const std::string& tbl_name, const std::string& index_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_index_by_name(_return, db_name, tbl_name, index_name); - return; - } else { - ifaces_[i]->get_index_by_name(_return, db_name, tbl_name, index_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_index_by_name(_return, db_name, tbl_name, index_name); } + ifaces_[i]->get_index_by_name(_return, db_name, tbl_name, index_name); + return; } void get_indexes(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const int16_t max_indexes) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_indexes(_return, db_name, tbl_name, max_indexes); - return; - } else { - ifaces_[i]->get_indexes(_return, db_name, tbl_name, max_indexes); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_indexes(_return, db_name, tbl_name, max_indexes); } + ifaces_[i]->get_indexes(_return, db_name, tbl_name, max_indexes); + return; } void get_index_names(std::vector & _return, const std::string& db_name, const std::string& tbl_name, const int16_t max_indexes) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_index_names(_return, db_name, tbl_name, max_indexes); - return; - } else { - ifaces_[i]->get_index_names(_return, db_name, tbl_name, max_indexes); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_index_names(_return, db_name, tbl_name, max_indexes); } + ifaces_[i]->get_index_names(_return, db_name, tbl_name, max_indexes); + return; } bool update_table_column_statistics(const ColumnStatistics& stats_obj) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->update_table_column_statistics(stats_obj); - } else { - ifaces_[i]->update_table_column_statistics(stats_obj); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->update_table_column_statistics(stats_obj); } + return ifaces_[i]->update_table_column_statistics(stats_obj); } bool update_partition_column_statistics(const ColumnStatistics& stats_obj) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->update_partition_column_statistics(stats_obj); - } else { - ifaces_[i]->update_partition_column_statistics(stats_obj); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->update_partition_column_statistics(stats_obj); } + return ifaces_[i]->update_partition_column_statistics(stats_obj); } void get_table_column_statistics(ColumnStatistics& _return, const std::string& db_name, const std::string& tbl_name, const std::string& col_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_table_column_statistics(_return, db_name, tbl_name, col_name); - return; - } else { - ifaces_[i]->get_table_column_statistics(_return, db_name, tbl_name, col_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_table_column_statistics(_return, db_name, tbl_name, col_name); } + ifaces_[i]->get_table_column_statistics(_return, db_name, tbl_name, col_name); + return; } void get_partition_column_statistics(ColumnStatistics& _return, const std::string& db_name, const std::string& tbl_name, const std::string& part_name, const std::string& col_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_partition_column_statistics(_return, db_name, tbl_name, part_name, col_name); - return; - } else { - ifaces_[i]->get_partition_column_statistics(_return, db_name, tbl_name, part_name, col_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_partition_column_statistics(_return, db_name, tbl_name, part_name, col_name); } + ifaces_[i]->get_partition_column_statistics(_return, db_name, tbl_name, part_name, col_name); + return; } bool delete_partition_column_statistics(const std::string& db_name, const std::string& tbl_name, const std::string& part_name, const std::string& col_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->delete_partition_column_statistics(db_name, tbl_name, part_name, col_name); - } else { - ifaces_[i]->delete_partition_column_statistics(db_name, tbl_name, part_name, col_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->delete_partition_column_statistics(db_name, tbl_name, part_name, col_name); } + return ifaces_[i]->delete_partition_column_statistics(db_name, tbl_name, part_name, col_name); } bool delete_table_column_statistics(const std::string& db_name, const std::string& tbl_name, const std::string& col_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->delete_table_column_statistics(db_name, tbl_name, col_name); - } else { - ifaces_[i]->delete_table_column_statistics(db_name, tbl_name, col_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->delete_table_column_statistics(db_name, tbl_name, col_name); } + return ifaces_[i]->delete_table_column_statistics(db_name, tbl_name, col_name); } bool create_role(const Role& role) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->create_role(role); - } else { - ifaces_[i]->create_role(role); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->create_role(role); } + return ifaces_[i]->create_role(role); } bool drop_role(const std::string& role_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->drop_role(role_name); - } else { - ifaces_[i]->drop_role(role_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->drop_role(role_name); } + return ifaces_[i]->drop_role(role_name); } void get_role_names(std::vector & _return) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_role_names(_return); - return; - } else { - ifaces_[i]->get_role_names(_return); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_role_names(_return); } + ifaces_[i]->get_role_names(_return); + return; } bool grant_role(const std::string& role_name, const std::string& principal_name, const PrincipalType::type principal_type, const std::string& grantor, const PrincipalType::type grantorType, const bool grant_option) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->grant_role(role_name, principal_name, principal_type, grantor, grantorType, grant_option); - } else { - ifaces_[i]->grant_role(role_name, principal_name, principal_type, grantor, grantorType, grant_option); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->grant_role(role_name, principal_name, principal_type, grantor, grantorType, grant_option); } + return ifaces_[i]->grant_role(role_name, principal_name, principal_type, grantor, grantorType, grant_option); } bool revoke_role(const std::string& role_name, const std::string& principal_name, const PrincipalType::type principal_type) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->revoke_role(role_name, principal_name, principal_type); - } else { - ifaces_[i]->revoke_role(role_name, principal_name, principal_type); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->revoke_role(role_name, principal_name, principal_type); } + return ifaces_[i]->revoke_role(role_name, principal_name, principal_type); } void list_roles(std::vector & _return, const std::string& principal_name, const PrincipalType::type principal_type) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->list_roles(_return, principal_name, principal_type); - return; - } else { - ifaces_[i]->list_roles(_return, principal_name, principal_type); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->list_roles(_return, principal_name, principal_type); } + ifaces_[i]->list_roles(_return, principal_name, principal_type); + return; } void get_privilege_set(PrincipalPrivilegeSet& _return, const HiveObjectRef& hiveObject, const std::string& user_name, const std::vector & group_names) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_privilege_set(_return, hiveObject, user_name, group_names); - return; - } else { - ifaces_[i]->get_privilege_set(_return, hiveObject, user_name, group_names); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_privilege_set(_return, hiveObject, user_name, group_names); } + ifaces_[i]->get_privilege_set(_return, hiveObject, user_name, group_names); + return; } void list_privileges(std::vector & _return, const std::string& principal_name, const PrincipalType::type principal_type, const HiveObjectRef& hiveObject) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->list_privileges(_return, principal_name, principal_type, hiveObject); - return; - } else { - ifaces_[i]->list_privileges(_return, principal_name, principal_type, hiveObject); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->list_privileges(_return, principal_name, principal_type, hiveObject); } + ifaces_[i]->list_privileges(_return, principal_name, principal_type, hiveObject); + return; } bool grant_privileges(const PrivilegeBag& privileges) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->grant_privileges(privileges); - } else { - ifaces_[i]->grant_privileges(privileges); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->grant_privileges(privileges); } + return ifaces_[i]->grant_privileges(privileges); } bool revoke_privileges(const PrivilegeBag& privileges) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->revoke_privileges(privileges); - } else { - ifaces_[i]->revoke_privileges(privileges); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->revoke_privileges(privileges); } + return ifaces_[i]->revoke_privileges(privileges); } void set_ugi(std::vector & _return, const std::string& user_name, const std::vector & group_names) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->set_ugi(_return, user_name, group_names); - return; - } else { - ifaces_[i]->set_ugi(_return, user_name, group_names); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->set_ugi(_return, user_name, group_names); } + ifaces_[i]->set_ugi(_return, user_name, group_names); + return; } void get_delegation_token(std::string& _return, const std::string& token_owner, const std::string& renewer_kerberos_principal_name) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - ifaces_[i]->get_delegation_token(_return, token_owner, renewer_kerberos_principal_name); - return; - } else { - ifaces_[i]->get_delegation_token(_return, token_owner, renewer_kerberos_principal_name); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->get_delegation_token(_return, token_owner, renewer_kerberos_principal_name); } + ifaces_[i]->get_delegation_token(_return, token_owner, renewer_kerberos_principal_name); + return; } int64_t renew_delegation_token(const std::string& token_str_form) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { - if (i == sz - 1) { - return ifaces_[i]->renew_delegation_token(token_str_form); - } else { - ifaces_[i]->renew_delegation_token(token_str_form); - } + size_t i = 0; + for (; i < (sz - 1); ++i) { + ifaces_[i]->renew_delegation_token(token_str_form); } + return ifaces_[i]->renew_delegation_token(token_str_form); } void cancel_delegation_token(const std::string& token_str_form) { size_t sz = ifaces_.size(); - for (size_t i = 0; i < sz; ++i) { + size_t i = 0; + for (; i < (sz - 1); ++i) { ifaces_[i]->cancel_delegation_token(token_str_form); } + ifaces_[i]->cancel_delegation_token(token_str_form); } }; Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp?rev=1406984&r1=1406983&r2=1406984&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp (original) +++ hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp Thu Nov 8 09:44:19 2012 @@ -2,10 +2,10 @@ // You should copy it to another filename to avoid overwriting it. #include "ThriftHiveMetastore.h" -#include -#include -#include -#include +#include +#include +#include +#include using namespace ::apache::thrift; using namespace ::apache::thrift::protocol; @@ -14,7 +14,7 @@ using namespace ::apache::thrift::server using boost::shared_ptr; -using namespace Apache::Hadoop::Hive; +using namespace ::Apache::Hadoop::Hive; class ThriftHiveMetastoreHandler : virtual public ThriftHiveMetastoreIf { public: Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp?rev=1406984&r1=1406983&r2=1406984&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp (original) +++ hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp Thu Nov 8 09:44:19 2012 @@ -1,7 +1,8 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated */ #include "hive_metastore_constants.h" Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h?rev=1406984&r1=1406983&r2=1406984&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h (original) +++ hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h Thu Nov 8 09:44:19 2012 @@ -1,7 +1,8 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated */ #ifndef hive_metastore_CONSTANTS_H #define hive_metastore_CONSTANTS_H