DRILL-5698: Revert unnecessary changes to C++ client

3 files changed, 40 insertions, 37 deletions

diff --git a/contrib/native/client/CMakeLists.txt b/contrib/native/client/CMakeLists.txt
index 796e1184c..7b54b00fd 100644
--- a/contrib/native/client/CMakeLists.txt
+++ b/contrib/native/client/CMakeLists.txt
@@ -93,7 +93,7 @@ else()
     #    of boost. Arbirtarily, we choose the new namspace to be drill_boost.
     #    See the instructions in the readme for linux/macos and rebuild boost. Then
     #    uncomment the line below to build
-        set(Boost_NAMESPACE drill_boost)
+    #    set(Boost_NAMESPACE drill_boost)
 endif()
 
 find_package(Boost 1.53.0 REQUIRED COMPONENTS regex system date_time chrono thread random)
diff --git a/contrib/native/client/example/querySubmitter.cpp b/contrib/native/client/example/querySubmitter.cpp
index 4fdfe17e8..47e55de2d 100644
--- a/contrib/native/client/example/querySubmitter.cpp
+++ b/contrib/native/client/example/querySubmitter.cpp
@@ -84,6 +84,7 @@ Drill::status_t QueryResultsListener(void* ctx, Drill::RecordBatch* b, Drill::Dr
     if(!err){
         if(b!=NULL){
             b->print(std::cout, 0); // print all rows
+            std::cout << "DATA RECEIVED ..." << std::endl;
             delete b; // we're done with this batch, we can delete it
             if(bTestCancel){
                 return Drill::QRY_FAILURE;
@@ -91,6 +92,7 @@ Drill::status_t QueryResultsListener(void* ctx, Drill::RecordBatch* b, Drill::Dr
                 return Drill::QRY_SUCCESS ;
             }
         }else{
+            std::cout << "Query Complete." << std::endl;
             return Drill::QRY_SUCCESS;
 		}
     }else{
@@ -151,7 +153,7 @@ void print(const Drill::FieldMetadata* pFieldMetadata, void* buf, size_t sz){
             sprintf((char*)printBuffer, "NIY");
             break;
     }
-    printf("%s ,", (char*)printBuffer);
+    printf("%s\t", (char*)printBuffer);
     return;
 }
 
@@ -395,6 +397,7 @@ int main(int argc, char* argv[]) {
             std::cerr<< "Failed to connect with error: "<< client.getError() << " (Using:"<<connectStr<<")"<<std::endl;
             return -1;
         }
+        std::cout<< "Connected!\n" << std::endl;
         if(api=="meta") {
         	Drill::Metadata* metadata = client.getMetadata();
         	if (metadata) {
diff --git a/contrib/native/client/src/include/drill/drillClient.hpp b/contrib/native/client/src/include/drill/drillClient.hpp
index 326dd3a5d..f09d7f5ec 100644
--- a/contrib/native/client/src/include/drill/drillClient.hpp
+++ b/contrib/native/client/src/include/drill/drillClient.hpp
@@ -338,15 +338,15 @@ namespace meta {
     _DL_INTERVAL_MINUTE_TO_SECOND = 1 << 16L
   };
 
-  template  _DateTimeLiteralSupport operator&(_DateTimeLiteralSupport __a, _DateTimeLiteralSupport __b);
-  template  _DateTimeLiteralSupport operator|(_DateTimeLiteralSupport __a, _DateTimeLiteralSupport __b);
-  template  _DateTimeLiteralSupport operator^(_DateTimeLiteralSupport __a, _DateTimeLiteralSupport __b);
+  template inline _DateTimeLiteralSupport operator&(_DateTimeLiteralSupport __a, _DateTimeLiteralSupport __b);
+  template inline _DateTimeLiteralSupport operator|(_DateTimeLiteralSupport __a, _DateTimeLiteralSupport __b);
+  template inline _DateTimeLiteralSupport operator^(_DateTimeLiteralSupport __a, _DateTimeLiteralSupport __b);
 
-  template  _DateTimeLiteralSupport& operator&=(_DateTimeLiteralSupport& __a, _DateTimeLiteralSupport __b);
-  template  _DateTimeLiteralSupport& operator|=(_DateTimeLiteralSupport& __a, _DateTimeLiteralSupport __b);
-  template  _DateTimeLiteralSupport& operator^=(_DateTimeLiteralSupport& __a, _DateTimeLiteralSupport __b);
+  template inline _DateTimeLiteralSupport& operator&=(_DateTimeLiteralSupport& __a, _DateTimeLiteralSupport __b);
+  template inline _DateTimeLiteralSupport& operator|=(_DateTimeLiteralSupport& __a, _DateTimeLiteralSupport __b);
+  template inline _DateTimeLiteralSupport& operator^=(_DateTimeLiteralSupport& __a, _DateTimeLiteralSupport __b);
 
-  template  _DateTimeLiteralSupport operator~(_DateTimeLiteralSupport __a);
+  template inline _DateTimeLiteralSupport operator~(_DateTimeLiteralSupport __a);
 
   /**
    * Date time literal support flags
@@ -396,15 +396,15 @@ namespace meta {
       _C_GROUPBY    = 1 << 1L
   };
 
-  template  _CollateSupport operator&(_CollateSupport __a, _CollateSupport __b);
-  template  _CollateSupport operator|(_CollateSupport __a, _CollateSupport __b);
-  template  _CollateSupport operator^(_CollateSupport __a, _CollateSupport __b);
+  template inline _CollateSupport operator&(_CollateSupport __a, _CollateSupport __b);
+  template inline _CollateSupport operator|(_CollateSupport __a, _CollateSupport __b);
+  template inline _CollateSupport operator^(_CollateSupport __a, _CollateSupport __b);
 
-  template  _CollateSupport& operator&=(_CollateSupport& __a, _CollateSupport __b);
-  template  _CollateSupport& operator|=(_CollateSupport& __a, _CollateSupport __b);
-  template  _CollateSupport& operator^=(_CollateSupport& __a, _CollateSupport __b);
+  template inline _CollateSupport& operator&=(_CollateSupport& __a, _CollateSupport __b);
+  template inline _CollateSupport& operator|=(_CollateSupport& __a, _CollateSupport __b);
+  template inline _CollateSupport& operator^=(_CollateSupport& __a, _CollateSupport __b);
 
-  template  _CollateSupport operator~(_CollateSupport __a);
+  template inline _CollateSupport operator~(_CollateSupport __a);
 
 
   /**
@@ -476,15 +476,15 @@ namespace meta {
       _OJ_ALL_COMPARISON_OPS    = 1 << 7L //!< _OJ_ALL_COMPARISON_OPS
   };
 
-  template  _OuterJoinSupport operator&(_OuterJoinSupport __a, _OuterJoinSupport __b);
-  template  _OuterJoinSupport operator|(_OuterJoinSupport __a, _OuterJoinSupport __b);
-  template  _OuterJoinSupport operator^(_OuterJoinSupport __a, _OuterJoinSupport __b);
+  template inline _OuterJoinSupport operator&(_OuterJoinSupport __a, _OuterJoinSupport __b);
+  template inline _OuterJoinSupport operator|(_OuterJoinSupport __a, _OuterJoinSupport __b);
+  template inline _OuterJoinSupport operator^(_OuterJoinSupport __a, _OuterJoinSupport __b);
 
-  template  _OuterJoinSupport& operator&=(_OuterJoinSupport& __a, _OuterJoinSupport __b);
-  template  _OuterJoinSupport& operator|=(_OuterJoinSupport& __a, _OuterJoinSupport __b);
-  template  _OuterJoinSupport& operator^=(_OuterJoinSupport& __a, _OuterJoinSupport __b);
+  template inline _OuterJoinSupport& operator&=(_OuterJoinSupport& __a, _OuterJoinSupport __b);
+  template inline _OuterJoinSupport& operator|=(_OuterJoinSupport& __a, _OuterJoinSupport __b);
+  template inline _OuterJoinSupport& operator^=(_OuterJoinSupport& __a, _OuterJoinSupport __b);
 
-  template  _OuterJoinSupport operator~(_OuterJoinSupport __a);
+  template inline _OuterJoinSupport operator~(_OuterJoinSupport __a);
 
   /**
    * Outer join support flags
@@ -541,15 +541,15 @@ namespace meta {
       _SQ_IN_QUANTIFIED = 1 << 5L
   };
 
-  template  _SubQuerySupport operator&(_SubQuerySupport __a, _SubQuerySupport __b);
-  template  _SubQuerySupport operator|(_SubQuerySupport __a, _SubQuerySupport __b);
-  template  _SubQuerySupport operator^(_SubQuerySupport __a, _SubQuerySupport __b);
+  template inline _SubQuerySupport operator&(_SubQuerySupport __a, _SubQuerySupport __b);
+  template inline _SubQuerySupport operator|(_SubQuerySupport __a, _SubQuerySupport __b);
+  template inline _SubQuerySupport operator^(_SubQuerySupport __a, _SubQuerySupport __b);
 
-  template  _SubQuerySupport& operator&=(_SubQuerySupport& __a, _SubQuerySupport __b);
-  template  _SubQuerySupport& operator|=(_SubQuerySupport& __a, _SubQuerySupport __b);
-  template  _SubQuerySupport& operator^=(_SubQuerySupport& __a, _SubQuerySupport __b);
+  template inline _SubQuerySupport& operator&=(_SubQuerySupport& __a, _SubQuerySupport __b);
+  template inline _SubQuerySupport& operator|=(_SubQuerySupport& __a, _SubQuerySupport __b);
+  template inline _SubQuerySupport& operator^=(_SubQuerySupport& __a, _SubQuerySupport __b);
 
-  template  _SubQuerySupport operator~(_SubQuerySupport __a);
+  template inline _SubQuerySupport operator~(_SubQuerySupport __a);
 
   /**
    * SubQuery support flags
@@ -579,15 +579,15 @@ namespace meta {
       _U_UNION_ALL  = 1 << 2L //!< _U_UNION_ALL
   };
 
-  template  _UnionSupport operator&(_UnionSupport __a, _UnionSupport __b);
-  template  _UnionSupport operator|(_UnionSupport __a, _UnionSupport __b);
-  template  _UnionSupport operator^(_UnionSupport __a, _UnionSupport __b);
+  template inline _UnionSupport operator&(_UnionSupport __a, _UnionSupport __b);
+  template inline _UnionSupport operator|(_UnionSupport __a, _UnionSupport __b);
+  template inline _UnionSupport operator^(_UnionSupport __a, _UnionSupport __b);
 
-  template  _UnionSupport& operator&=(_UnionSupport& __a, _UnionSupport __b);
-  template  _UnionSupport& operator|=(_UnionSupport& __a, _UnionSupport __b);
-  template  _UnionSupport& operator^=(_UnionSupport& __a, _UnionSupport __b);
+  template inline _UnionSupport& operator&=(_UnionSupport& __a, _UnionSupport __b);
+  template inline _UnionSupport& operator|=(_UnionSupport& __a, _UnionSupport __b);
+  template inline _UnionSupport& operator^=(_UnionSupport& __a, _UnionSupport __b);
 
-  template  _UnionSupport operator~(_UnionSupport __a);
+  template inline _UnionSupport operator~(_UnionSupport __a);
 
   /**
    * Union support flags