From 4baf769e5e9df810b3b01bad1757b27a423b7842 Mon Sep 17 00:00:00 2001 From: Kunal Khatua Date: Sun, 10 Jun 2018 23:36:10 -0700 Subject: DRILL-6455: Add missing JDBC Scan Operator for profiles The operator is missing in the profile protobuf. This commit introduces that. 1. Added protobuf files (incl generated C++ and Java) 2. Updated JdbcSubScan's getOperatorType API closes #1297 --- contrib/native/client/src/protobuf/UserBitShared.pb.cc | 13 +++++++------ contrib/native/client/src/protobuf/UserBitShared.pb.h | 5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'contrib/native/client/src') diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.cc b/contrib/native/client/src/protobuf/UserBitShared.pb.cc index e237669a5..c99030d95 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*\360\006\n\020CoreOpe" + "\022\032\n\026CANCELLATION_REQUESTED\020\006*\377\006\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" @@ -772,11 +772,11 @@ void protobuf_AddDesc_UserBitShared_2eproto() { "AN\020$\022\021\n\rPCAP_SUB_SCAN\020%\022\022\n\016KAFKA_SUB_SCA" "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+*g\n\nSaslS" - "tatus\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.exe" - "c.protoB\rUserBitSharedH\001", 5184); + "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); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "UserBitShared.proto", &protobuf_RegisterTypes); UserCredentials::default_instance_ = new UserCredentials(); @@ -941,6 +941,7 @@ bool CoreOperatorType_IsValid(int value) { case 41: case 42: case 43: + case 44: 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 c4d846fc2..a78258a9a 100644 --- a/contrib/native/client/src/protobuf/UserBitShared.pb.h +++ b/contrib/native/client/src/protobuf/UserBitShared.pb.h @@ -247,11 +247,12 @@ enum CoreOperatorType { FLATTEN = 40, LATERAL_JOIN = 41, UNNEST = 42, - HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN = 43 + HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN = 43, + JDBC_SCAN = 44 }; bool CoreOperatorType_IsValid(int value); const CoreOperatorType CoreOperatorType_MIN = SINGLE_SENDER; -const CoreOperatorType CoreOperatorType_MAX = HIVE_DRILL_NATIVE_PARQUET_ROW_GROUP_SCAN; +const CoreOperatorType CoreOperatorType_MAX = JDBC_SCAN; const int CoreOperatorType_ARRAYSIZE = CoreOperatorType_MAX + 1; const ::google::protobuf::EnumDescriptor* CoreOperatorType_descriptor(); -- cgit v1.2.3