This is an automated email from the ASF dual-hosted git repository. sorabh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit f7ae370b9c4acd78c3d9e03019c4a1a8cc4ebf16 Author: Sorabh Hamirwasia <[email protected]> AuthorDate: Wed Jul 25 22:49:17 2018 -0700 DRILL-6635: PartitionLimit for Lateral/Unnest Protobuf changes to add new operator PartitionLimit --- .../native/client/src/protobuf/UserBitShared.pb.cc | 14 ++++++++------ .../native/client/src/protobuf/UserBitShared.pb.h | 5 +++-- .../org/apache/drill/exec/proto/UserBitShared.java | 22 ++++++++++++++++------ .../drill/exec/proto/beans/CoreOperatorType.java | 4 +++- protocol/src/main/protobuf/UserBitShared.proto | 1 + 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.cc b/contrib/native/client/src/protobuf/UserBitShared.pb.cc index 282f581..7398048 100644 --- a/contrib/native/client/src/protobuf/UserBitShared.pb.cc +++ b/contrib/native/client/src/protobuf/UserBitShared.pb.cc @@ -750,7 +750,7 @@ void protobuf_AddDesc_UserBitShared_2eproto() { "TATEMENT\020\005*\207\001\n\rFragmentState\022\013\n\007SENDING\020" "\000\022\027\n\023AWAITING_ALLOCATION\020\001\022\013\n\007RUNNING\020\002\022" "\014\n\010FINISHED\020\003\022\r\n\tCANCELLED\020\004\022\n\n\006FAILED\020\005" - "\022\032\n\026CANCELLATION_REQUESTED\020\006*\271\010\n\020CoreOpe" + "\022\032\n\026CANCELLATION_REQUESTED\020\006*\316\010\n\020CoreOpe" "ratorType\022\021\n\rSINGLE_SENDER\020\000\022\024\n\020BROADCAS" "T_SENDER\020\001\022\n\n\006FILTER\020\002\022\022\n\016HASH_AGGREGATE" "\020\003\022\r\n\tHASH_JOIN\020\004\022\016\n\nMERGE_JOIN\020\005\022\031\n\025HAS" @@ -777,11 +777,12 @@ void protobuf_AddDesc_UserBitShared_2eproto() { "_SCAN\020.\022\022\n\016MONGO_SUB_SCAN\020/\022\017\n\013KUDU_WRIT" "ER\0200\022\026\n\022OPEN_TSDB_SUB_SCAN\0201\022\017\n\013JSON_WRI" "TER\0202\022\026\n\022HTPPD_LOG_SUB_SCAN\0203\022\022\n\016IMAGE_S" - "UB_SCAN\0204\022\025\n\021SEQUENCE_SUB_SCAN\0205*g\n\nSasl" - "Status\022\020\n\014SASL_UNKNOWN\020\000\022\016\n\nSASL_START\020\001" - "\022\024\n\020SASL_IN_PROGRESS\020\002\022\020\n\014SASL_SUCCESS\020\003" - "\022\017\n\013SASL_FAILED\020\004B.\n\033org.apache.drill.ex" - "ec.protoB\rUserBitSharedH\001", 5385); + "UB_SCAN\0204\022\025\n\021SEQUENCE_SUB_SCAN\0205\022\023\n\017PART" + "ITION_LIMIT\0206*g\n\nSaslStatus\022\020\n\014SASL_UNKN" + "OWN\020\000\022\016\n\nSASL_START\020\001\022\024\n\020SASL_IN_PROGRES" + "S\020\002\022\020\n\014SASL_SUCCESS\020\003\022\017\n\013SASL_FAILED\020\004B." + "\n\033org.apache.drill.exec.protoB\rUserBitSh" + "aredH\001", 5406); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "UserBitShared.proto", &protobuf_RegisterTypes); UserCredentials::default_instance_ = new UserCredentials(); @@ -956,6 +957,7 @@ bool CoreOperatorType_IsValid(int value) { case 51: case 52: case 53: + case 54: return true; default: return false; diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.h b/contrib/native/client/src/protobuf/UserBitShared.pb.h index 134dc2b..4599abb 100644 --- a/contrib/native/client/src/protobuf/UserBitShared.pb.h +++ b/contrib/native/client/src/protobuf/UserBitShared.pb.h @@ -257,11 +257,12 @@ enum CoreOperatorType { JSON_WRITER = 50, HTPPD_LOG_SUB_SCAN = 51, IMAGE_SUB_SCAN = 52, - SEQUENCE_SUB_SCAN = 53 + SEQUENCE_SUB_SCAN = 53, + PARTITION_LIMIT = 54 }; bool CoreOperatorType_IsValid(int value); const CoreOperatorType CoreOperatorType_MIN = SINGLE_SENDER; -const CoreOperatorType CoreOperatorType_MAX = SEQUENCE_SUB_SCAN; +const CoreOperatorType CoreOperatorType_MAX = PARTITION_LIMIT; const int CoreOperatorType_ARRAYSIZE = CoreOperatorType_MAX + 1; const ::google::protobuf::EnumDescriptor* CoreOperatorType_descriptor(); diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java index a8574f5..77bf211 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java @@ -581,6 +581,10 @@ public final class UserBitShared { * <code>SEQUENCE_SUB_SCAN = 53;</code> */ SEQUENCE_SUB_SCAN(53, 53), + /** + * <code>PARTITION_LIMIT = 54;</code> + */ + PARTITION_LIMIT(54, 54), ; /** @@ -799,6 +803,10 @@ public final class UserBitShared { * <code>SEQUENCE_SUB_SCAN = 53;</code> */ public static final int SEQUENCE_SUB_SCAN_VALUE = 53; + /** + * <code>PARTITION_LIMIT = 54;</code> + */ + public static final int PARTITION_LIMIT_VALUE = 54; public final int getNumber() { return value; } @@ -859,6 +867,7 @@ public final class UserBitShared { case 51: return HTPPD_LOG_SUB_SCAN; case 52: return IMAGE_SUB_SCAN; case 53: return SEQUENCE_SUB_SCAN; + case 54: return PARTITION_LIMIT; default: return null; } } @@ -24395,7 +24404,7 @@ public final class UserBitShared { "TATEMENT\020\005*\207\001\n\rFragmentState\022\013\n\007SENDING\020" + "\000\022\027\n\023AWAITING_ALLOCATION\020\001\022\013\n\007RUNNING\020\002\022" + "\014\n\010FINISHED\020\003\022\r\n\tCANCELLED\020\004\022\n\n\006FAILED\020\005" + - "\022\032\n\026CANCELLATION_REQUESTED\020\006*\271\010\n\020CoreOpe" + + "\022\032\n\026CANCELLATION_REQUESTED\020\006*\316\010\n\020CoreOpe" + "ratorType\022\021\n\rSINGLE_SENDER\020\000\022\024\n\020BROADCAS" + "T_SENDER\020\001\022\n\n\006FILTER\020\002\022\022\n\016HASH_AGGREGATE" + "\020\003\022\r\n\tHASH_JOIN\020\004\022\016\n\nMERGE_JOIN\020\005\022\031\n\025HAS" + @@ -24422,11 +24431,12 @@ public final class UserBitShared { "_SCAN\020.\022\022\n\016MONGO_SUB_SCAN\020/\022\017\n\013KUDU_WRIT" + "ER\0200\022\026\n\022OPEN_TSDB_SUB_SCAN\0201\022\017\n\013JSON_WRI" + "TER\0202\022\026\n\022HTPPD_LOG_SUB_SCAN\0203\022\022\n\016IMAGE_S", - "UB_SCAN\0204\022\025\n\021SEQUENCE_SUB_SCAN\0205*g\n\nSasl" + - "Status\022\020\n\014SASL_UNKNOWN\020\000\022\016\n\nSASL_START\020\001" + - "\022\024\n\020SASL_IN_PROGRESS\020\002\022\020\n\014SASL_SUCCESS\020\003" + - "\022\017\n\013SASL_FAILED\020\004B.\n\033org.apache.drill.ex" + - "ec.protoB\rUserBitSharedH\001" + "UB_SCAN\0204\022\025\n\021SEQUENCE_SUB_SCAN\0205\022\023\n\017PART" + + "ITION_LIMIT\0206*g\n\nSaslStatus\022\020\n\014SASL_UNKN" + + "OWN\020\000\022\016\n\nSASL_START\020\001\022\024\n\020SASL_IN_PROGRES" + + "S\020\002\022\020\n\014SASL_SUCCESS\020\003\022\017\n\013SASL_FAILED\020\004B." + + "\n\033org.apache.drill.exec.protoB\rUserBitSh" + + "aredH\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java index 53af571..38ac50e 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java @@ -75,7 +75,8 @@ public enum CoreOperatorType implements com.dyuproject.protostuff.EnumLite<CoreO JSON_WRITER(50), HTPPD_LOG_SUB_SCAN(51), IMAGE_SUB_SCAN(52), - SEQUENCE_SUB_SCAN(53); + SEQUENCE_SUB_SCAN(53), + PARTITION_LIMIT(54); public final int number; @@ -147,6 +148,7 @@ public enum CoreOperatorType implements com.dyuproject.protostuff.EnumLite<CoreO case 51: return HTPPD_LOG_SUB_SCAN; case 52: return IMAGE_SUB_SCAN; case 53: return SEQUENCE_SUB_SCAN; + case 54: return PARTITION_LIMIT; default: return null; } } diff --git a/protocol/src/main/protobuf/UserBitShared.proto b/protocol/src/main/protobuf/UserBitShared.proto index 4c4960e..65ebe0b 100644 --- a/protocol/src/main/protobuf/UserBitShared.proto +++ b/protocol/src/main/protobuf/UserBitShared.proto @@ -342,6 +342,7 @@ enum CoreOperatorType { HTPPD_LOG_SUB_SCAN = 51; IMAGE_SUB_SCAN = 52; SEQUENCE_SUB_SCAN = 53; + PARTITION_LIMIT = 54; } /* Registry that contains list of jars, each jar contains its name and list of function signatures.
