You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by vi...@apache.org on 2018/07/23 14:43:34 UTC
[drill] branch master updated: DRILL-6627: Adding REGEX_SUB_SCAN
operator to protobuf file
This is an automated email from the ASF dual-hosted git repository.
vitalii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 2162986 DRILL-6627: Adding REGEX_SUB_SCAN operator to protobuf file
2162986 is described below
commit 2162986ce50f566cb80151d97b05fb5557d8d2ab
Author: Vitalii Diravka <vi...@gmail.com>
AuthorDate: Mon Jul 23 14:44:48 2018 +0300
DRILL-6627: Adding REGEX_SUB_SCAN operator to protobuf file
- The operator is added to Java based UserBitShared.proto and C++ based UserBitShared.pb.h
- Java and C++ protobuf files are regenerated
---
contrib/native/client/src/protobuf/UserBitShared.pb.cc | 12 +++++++-----
contrib/native/client/src/protobuf/UserBitShared.pb.h | 5 +++--
.../java/org/apache/drill/exec/proto/UserBitShared.java | 14 +++++++-------
.../apache/drill/exec/proto/beans/CoreOperatorType.java | 4 +++-
protocol/src/main/protobuf/UserBitShared.proto | 1 +
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.cc b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
index c99030d..e6366a3 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*\377\006\n\020CoreOpe"
+ "\022\032\n\026CANCELLATION_REQUESTED\020\006*\223\007\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"
@@ -773,10 +773,11 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
"N\020&\022\021\n\rKUDU_SUB_SCAN\020\'\022\013\n\007FLATTEN\020(\022\020\n\014L"
"ATERAL_JOIN\020)\022\n\n\006UNNEST\020*\022,\n(HIVE_DRILL_"
"NATIVE_PARQUET_ROW_GROUP_SCAN\020+\022\r\n\tJDBC_"
- "SCAN\020,*g\n\nSaslStatus\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\014"
- "SASL_SUCCESS\020\003\022\017\n\013SASL_FAILED\020\004B.\n\033org.a"
- "pache.drill.exec.protoB\rUserBitSharedH\001", 5199);
+ "SCAN\020,\022\022\n\016REGEX_SUB_SCAN\020-*g\n\nSaslStatus"
+ "\022\020\n\014SASL_UNKNOWN\020\000\022\016\n\nSASL_START\020\001\022\024\n\020SA"
+ "SL_IN_PROGRESS\020\002\022\020\n\014SASL_SUCCESS\020\003\022\017\n\013SA"
+ "SL_FAILED\020\004B.\n\033org.apache.drill.exec.pro"
+ "toB\rUserBitSharedH\001", 5219);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"UserBitShared.proto", &protobuf_RegisterTypes);
UserCredentials::default_instance_ = new UserCredentials();
@@ -942,6 +943,7 @@ bool CoreOperatorType_IsValid(int value) {
case 42:
case 43:
case 44:
+ case 45:
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 a78258a..6efeffb 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.h
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.h
@@ -248,11 +248,12 @@ enum CoreOperatorType {
LATERAL_JOIN = 41,
UNNEST = 42,
HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN = 43,
- JDBC_SCAN = 44
+ JDBC_SCAN = 44,
+ REGEX_SUB_SCAN = 45
};
bool CoreOperatorType_IsValid(int value);
const CoreOperatorType CoreOperatorType_MIN = SINGLE_SENDER;
-const CoreOperatorType CoreOperatorType_MAX = JDBC_SCAN;
+const CoreOperatorType CoreOperatorType_MAX = REGEX_SUB_SCAN;
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 64703c3..0243ed5 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
@@ -548,7 +548,7 @@ public final class UserBitShared {
/**
* <code>REGEX_SUB_SCAN = 45;</code>
*/
- REGEX_SUB_SCAN(45,45),
+ REGEX_SUB_SCAN(45, 45),
;
/**
@@ -737,7 +737,6 @@ public final class UserBitShared {
public static final int REGEX_SUB_SCAN_VALUE = 45;
-
public final int getNumber() { return value; }
public static CoreOperatorType valueOf(int value) {
@@ -24324,7 +24323,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*\377\006\n\020CoreOpe" +
+ "\022\032\n\026CANCELLATION_REQUESTED\020\006*\223\007\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" +
@@ -24347,10 +24346,11 @@ public final class UserBitShared {
"N\020&\022\021\n\rKUDU_SUB_SCAN\020\'\022\013\n\007FLATTEN\020(\022\020\n\014L" +
"ATERAL_JOIN\020)\022\n\n\006UNNEST\020*\022,\n(HIVE_DRILL_" +
"NATIVE_PARQUET_ROW_GROUP_SCAN\020+\022\r\n\tJDBC_" +
- "SCAN\020,*g\n\nSaslStatus\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\014" +
- "SASL_SUCCESS\020\003\022\017\n\013SASL_FAILED\020\004B.\n\033org.a" +
- "pache.drill.exec.protoB\rUserBitSharedH\001"
+ "SCAN\020,\022\022\n\016REGEX_SUB_SCAN\020-*g\n\nSaslStatus" +
+ "\022\020\n\014SASL_UNKNOWN\020\000\022\016\n\nSASL_START\020\001\022\024\n\020SA" +
+ "SL_IN_PROGRESS\020\002\022\020\n\014SASL_SUCCESS\020\003\022\017\n\013SA" +
+ "SL_FAILED\020\004B.\n\033org.apache.drill.exec.pro",
+ "toB\rUserBitSharedH\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 f14f44a..45b9cc11 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
@@ -66,7 +66,8 @@ public enum CoreOperatorType implements com.dyuproject.protostuff.EnumLite<CoreO
LATERAL_JOIN(41),
UNNEST(42),
HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN(43),
- JDBC_SCAN(44);
+ JDBC_SCAN(44),
+ REGEX_SUB_SCAN(45);
public final int number;
@@ -129,6 +130,7 @@ public enum CoreOperatorType implements com.dyuproject.protostuff.EnumLite<CoreO
case 42: return UNNEST;
case 43: return HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN;
case 44: return JDBC_SCAN;
+ case 45: return REGEX_SUB_SCAN;
default: return null;
}
}
diff --git a/protocol/src/main/protobuf/UserBitShared.proto b/protocol/src/main/protobuf/UserBitShared.proto
index 302e3b1..47715a4 100644
--- a/protocol/src/main/protobuf/UserBitShared.proto
+++ b/protocol/src/main/protobuf/UserBitShared.proto
@@ -333,6 +333,7 @@ enum CoreOperatorType {
UNNEST = 42;
HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN = 43;
JDBC_SCAN = 44;
+ REGEX_SUB_SCAN = 45;
}
/* Registry that contains list of jars, each jar contains its name and list of function signatures.