DRILL-1297: C++ Client. Hide Dependencies From Public API to enable using C++ Client as a DLL

1 files changed, 19 insertions, 6 deletions

diff --git a/contrib/native/client/src/include/drill/drillClient.hpp b/contrib/native/client/src/include/drill/drillClient.hpp
index d03f88dad..f1369ee74 100644
--- a/contrib/native/client/src/include/drill/drillClient.hpp
+++ b/contrib/native/client/src/include/drill/drillClient.hpp
@@ -23,7 +23,7 @@
 #include <vector>
 #include <boost/thread.hpp>
 #include "drill/common.hpp"
-#include "drill/protobuf/User.pb.h"
+#include "drill/protobuf/Types.pb.h"
 
 
 #if defined _WIN32 || defined __CYGWIN__
@@ -44,7 +44,14 @@
   #endif
 #endif
 
-namespace Drill {
+namespace exec{
+    namespace shared{
+        class DrillPBError;
+        enum QueryType;
+    };
+};
+
+namespace Drill{
 
 //struct UserServerEndPoint;
 class  DrillClientImpl;
@@ -53,6 +60,12 @@ class  FieldMetadata;
 class  RecordBatch;
 class  SchemaDef;
 
+enum QueryType{
+    SQL = 1,
+    LOGICAL = 2,
+    PHYSICAL = 3
+};
+
 class DECLSPEC_DRILL_CLIENT DrillClientError{
     public:
         static const uint32_t CONN_ERROR_START = 100;
@@ -222,16 +235,16 @@ class DECLSPEC_DRILL_CLIENT DrillClient{
         void close() ;
 
         /*
-         * Submit a query asynchronously and wait for results to be returned thru a callback. A query context handle is passed
+         * Submit a query asynchronously and wait for results to be returned through a callback. A query context handle is passed
          * back. The listener callback will return the handle in the ctx parameter.
          */
-        status_t submitQuery(::exec::shared::QueryType t, const std::string& plan, pfnQueryResultsListener listener, void* listenerCtx, QueryHandle_t* qHandle);
+        status_t submitQuery(Drill::QueryType t, const std::string& plan, pfnQueryResultsListener listener, void* listenerCtx, QueryHandle_t* qHandle);
 
         /*
-         * Submit a query asynchronously and wait for results to be returned thru an iterator that returns
+         * Submit a query asynchronously and wait for results to be returned through an iterator that returns
          * results synchronously. The client app needs to call delete on the iterator when done.
          */
-        RecordIterator* submitQuery(::exec::shared::QueryType t, const std::string& plan, DrillClientError* err);
+        RecordIterator* submitQuery(Drill::QueryType t, const std::string& plan, DrillClientError* err);
 
         /*
          * The client application should call this function to wait for results if it has registered a