Unset GIT_DIR and update the azure header files

snowflakedb · May 23, 2019 · ef69fe3 · ef69fe3
1 parent cf52e43
commit ef69fe3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/deps-build/linux/azure/include/blob/blob_client.h b/deps-build/linux/azure/include/blob/blob_client.h
@@ -119,7 +119,7 @@ namespace azure { namespace storage_lite {
         /// <param name="metadata">A <see cref="std::vector"> that respresents metadatas.</param>
         /// <param name="streamlen">Length of the stream. Used only when the stream does not support tellg/seekg</param>
         /// <returns>A <see cref="std::future" /> object that represents the current operation.</returns>
-        AZURE_STORAGE_API std::future<storage_outcome<void>> upload_block_blob_from_stream(const std::string &container, const std::string &blob, std::istream &is, const std::vector<std::pair<std::string, std::string>> &metadata, size_t streamlen);
+        AZURE_STORAGE_API std::future<storage_outcome<void>> upload_block_blob_from_stream(const std::string &container, const std::string &blob, std::istream &is, const std::vector<std::pair<std::string, std::string>> &metadata, unsigned long long streamlen);
 
 
         /// <summary>
@@ -413,7 +413,7 @@ namespace azure { namespace storage_lite {
         /// <param name="is">The source stream.</param>
         /// <param name="metadata">A <see cref="std::vector"> that respresents metadatas.</param>
         /// <param name="streamlen">Length of the stream. Used only when the stream does not support tellg/seekg</param>
-        void upload_block_blob_from_stream(const std::string &container, const std::string blob, std::istream &is, const std::vector<std::pair<std::string, std::string>> &metadata = std::vector<std::pair<std::string, std::string>>(), size_t streamlen = NOT_USER_DEFINED_STREAMLEN);
+        void upload_block_blob_from_stream(const std::string &container, const std::string blob, std::istream &is, const std::vector<std::pair<std::string, std::string>> &metadata = std::vector<std::pair<std::string, std::string>>(), unsigned long long streamlen = NOT_USER_DEFINED_STREAMLEN);
 
         /// <summary>
         /// Uploads the contents of a blob from a local file.
@@ -484,7 +484,7 @@ namespace azure { namespace storage_lite {
         std::mutex s_mutex;
         unsigned int m_concurrency;
         bool m_valid;
-        static const size_t NOT_USER_DEFINED_STREAMLEN = ULLONG_MAX ;
+        static const unsigned long long NOT_USER_DEFINED_STREAMLEN = ULLONG_MAX ;
     };
 
 } } // azure::storage_lite
diff --git a/deps-build/linux/azure/include/http/libcurl_http_client.h b/deps-build/linux/azure/include/http/libcurl_http_client.h
@@ -127,12 +127,12 @@ namespace azure {  namespace storage_lite {
             check_code(curl_easy_setopt(m_curl, CURLOPT_READDATA, this));
         }
 
-        void set_input_stream_length(size_t streamlen)
+        void set_input_stream_length(unsigned long long streamlen)
         {
             m_input_stream_len=streamlen;
         }
 
-        size_t get_input_stream_length(void)
+        unsigned long long get_input_stream_length(void)
         {
             return m_input_stream_len;
         }
@@ -201,7 +201,7 @@ namespace azure {  namespace storage_lite {
         storage_istream m_input_stream;
         storage_ostream m_output_stream;
         storage_iostream m_error_stream;
-        size_t m_input_stream_len;
+        unsigned long long m_input_stream_len;
         bool m_input_stream_len_known;
         std::function<bool(http_code)> m_switch_error_callback;
 
@@ -228,7 +228,7 @@ namespace azure {  namespace storage_lite {
         {
             REQUEST_TYPE *p = static_cast<REQUEST_TYPE *>(userdata);
             auto &s = p->m_input_stream.istream();
-            size_t streamlen = p->get_input_stream_length();
+            unsigned long long streamlen = p->get_input_stream_length();
             size_t actual_size = 0 ;
             if( ! p->get_is_stream_length() ) {
                 auto cur = s.tellg();
@@ -239,7 +239,7 @@ namespace azure {  namespace storage_lite {
             }
             else
             {
-                actual_size = std::min(streamlen, size * nitems);
+                actual_size = std::min(streamlen, (unsigned long long)size * nitems);
             }
 
             s.read(buffer, actual_size);

diff --git a/deps-build/linux/azure/lib/libazure-storage-lite.a b/deps-build/linux/azure/lib/libazure-storage-lite.a
diff --git a/scripts/build_awssdk.sh b/scripts/build_awssdk.sh
@@ -52,5 +52,8 @@ export GIT_DIR=/tmp
 
 cd $AWS_CMAKE_BUILD_DIR
 $CMAKE -E env CXXFLAGS=$ADDITIONAL_CXXFLAGS $CMAKE ${aws_configure_opts[@]} ../
+
+unset GIT_DIR
+
 make
 make install
diff --git a/scripts/build_azuresdk.sh b/scripts/build_azuresdk.sh
@@ -97,6 +97,8 @@ if [ "$(uname -s)" == "Linux" ] ; then
 else
   $CMAKE -E env $CMAKE ${azure_configure_opts[@]} CXXFLAGS=$ADDITIONAL_CXXFLAGS LDFLAGS=$ADDITIONAL_CXXFLAGS -DEXTRA_LIBRARIES="-ldl -lpthread $DEPENDENCY_DIR/zlib/lib/libz.a" ../
 fi
+
+unset GIT_DIR
 
 make
 make install