drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [13/13] drill git commit: Drill-5698 Escape version number period separator, this captures version numbers with 4 5 or 6 in them, like 1.8.0_144
Date Tue, 15 Aug 2017 13:44:25 GMT
Drill-5698 Escape version number period separator, this captures version numbers with 4 5 or
6 in them, like 1.8.0_144

release build

build example

remove print statements

close #890


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/109b2c09
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/109b2c09
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/109b2c09

Branch: refs/heads/master
Commit: 109b2c09433789babb1704e30429450806dd5b37
Parents: 1cec10b
Author: Darren Brien <darrenbrien@aol.com>
Authored: Mon Jul 31 11:52:41 2017 +0100
Committer: Jinfeng Ni <jni@apache.org>
Committed: Mon Aug 14 22:19:24 2017 -0700

----------------------------------------------------------------------
 contrib/native/client/CMakeLists.txt            |  2 +-
 .../native/client/example/querySubmitter.cpp    |  5 +-
 .../client/src/include/drill/drillClient.hpp    | 70 ++++++++++----------
 distribution/src/resources/drill-config.sh      |  2 +-
 4 files changed, 38 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/109b2c09/contrib/native/client/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/contrib/native/client/CMakeLists.txt b/contrib/native/client/CMakeLists.txt
index 7b54b00..796e118 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)

http://git-wip-us.apache.org/repos/asf/drill/blob/109b2c09/contrib/native/client/example/querySubmitter.cpp
----------------------------------------------------------------------
diff --git a/contrib/native/client/example/querySubmitter.cpp b/contrib/native/client/example/querySubmitter.cpp
index 47e55de..4fdfe17 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) {

http://git-wip-us.apache.org/repos/asf/drill/blob/109b2c09/contrib/native/client/src/include/drill/drillClient.hpp
----------------------------------------------------------------------
diff --git a/contrib/native/client/src/include/drill/drillClient.hpp b/contrib/native/client/src/include/drill/drillClient.hpp
index f09d7f5..326dd3a 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

http://git-wip-us.apache.org/repos/asf/drill/blob/109b2c09/distribution/src/resources/drill-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh
index 32306ee..92119e5 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


Mime
View raw message