diff options
| -rw-r--r-- | contrib/native/client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/native/client/example/querySubmitter.cpp | 5 | ||||
| -rw-r--r-- | contrib/native/client/src/include/drill/drillClient.hpp | 70 | ||||
| -rw-r--r-- | distribution/src/resources/drill-config.sh | 2 |
4 files changed, 38 insertions, 41 deletions
diff --git a/contrib/native/client/CMakeLists.txt b/contrib/native/client/CMakeLists.txt index 7b54b00fd..796e1184c 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 47e55de2d..4fdfe17e8 100644 --- a/contrib/native/client/example/querySubmitter.cpp +++ b/contrib/native/client/example/querySubmitter.cpp @@ -84,7 +84,6 @@ 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; @@ -92,7 +91,6 @@ 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{ @@ -153,7 +151,7 @@ void print(const Drill::FieldMetadata* pFieldMetadata, void* buf, size_t sz){ sprintf((char*)printBuffer, "NIY"); break; } - printf("%s\t", (char*)printBuffer); + printf("%s ,", (char*)printBuffer); return; } @@ -397,7 +395,6 @@ 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 f09d7f5ec..326dd3a5d 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 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, _DateTimeLiteralSupport __b); + template _DateTimeLiteralSupport& operator|=(_DateTimeLiteralSupport& __a, _DateTimeLiteralSupport __b); + template _DateTimeLiteralSupport& operator^=(_DateTimeLiteralSupport& __a, _DateTimeLiteralSupport __b); - template inline _DateTimeLiteralSupport operator~(_DateTimeLiteralSupport __a); + template _DateTimeLiteralSupport operator~(_DateTimeLiteralSupport __a); /** * Date time literal support flags @@ -396,15 +396,15 @@ namespace meta { _C_GROUPBY = 1 << 1L }; - 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, _CollateSupport __b); + template _CollateSupport& operator|=(_CollateSupport& __a, _CollateSupport __b); + template _CollateSupport& operator^=(_CollateSupport& __a, _CollateSupport __b); - template inline _CollateSupport operator~(_CollateSupport __a); + template _CollateSupport operator~(_CollateSupport __a); /** @@ -476,15 +476,15 @@ namespace meta { _OJ_ALL_COMPARISON_OPS = 1 << 7L //!< _OJ_ALL_COMPARISON_OPS }; - 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, _OuterJoinSupport __b); + template _OuterJoinSupport& operator|=(_OuterJoinSupport& __a, _OuterJoinSupport __b); + template _OuterJoinSupport& operator^=(_OuterJoinSupport& __a, _OuterJoinSupport __b); - template inline _OuterJoinSupport operator~(_OuterJoinSupport __a); + template _OuterJoinSupport operator~(_OuterJoinSupport __a); /** * Outer join support flags @@ -541,15 +541,15 @@ namespace meta { _SQ_IN_QUANTIFIED = 1 << 5L }; - 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, _SubQuerySupport __b); + template _SubQuerySupport& operator|=(_SubQuerySupport& __a, _SubQuerySupport __b); + template _SubQuerySupport& operator^=(_SubQuerySupport& __a, _SubQuerySupport __b); - template inline _SubQuerySupport operator~(_SubQuerySupport __a); + template _SubQuerySupport operator~(_SubQuerySupport __a); /** * SubQuery support flags @@ -579,15 +579,15 @@ namespace meta { _U_UNION_ALL = 1 << 2L //!< _U_UNION_ALL }; - 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, _UnionSupport __b); + template _UnionSupport& operator|=(_UnionSupport& __a, _UnionSupport __b); + template _UnionSupport& operator^=(_UnionSupport& __a, _UnionSupport __b); - template inline _UnionSupport operator~(_UnionSupport __a); + template _UnionSupport operator~(_UnionSupport __a); /** * Union support flags diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh index 32306ee96..92119e5a2 100644 --- a/distribution/src/resources/drill-config.sh +++ b/distribution/src/resources/drill-config.sh @@ -393,7 +393,7 @@ if [ ! -e "$JAVA" ]; then fi # Ensure that Java version is at least 1.7 -"$JAVA" -version 2>&1 | grep "version" | egrep -e "1.4|1.5|1.6" > /dev/null +"$JAVA" -version 2>&1 | grep "version" | egrep -e "1\.4|1\.5|1\.6" > /dev/null if [ $? -eq 0 ]; then fatal_error "Java 1.7 or later is required to run Apache Drill." fi |