ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings#3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
emkornfield wants to merge 4 commits into from
Closed

ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings #3793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86d1693
ARROW-4744: [C++][CI] Add static cast to input_len to avoid warning
emkornfield Mar 2, 2019
96e127e
Fix other places where cast was happening
emkornfield Mar 2, 2019
6b7c1f4
more brotli fixes
emkornfield Mar 2, 2019
0dd4e6f
Change mingw back to release. Cleanup some more conversion errors
emkornfield Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/appveyor-cpp-build-mingw.bat
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@

@echo on

set CMAKE_BUILD_TYPE=debug
set MESON_BUILD_TYPE=debug
set CMAKE_BUILD_TYPE=release
set MESON_BUILD_TYPE=release

set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
Expand Down
14 changes: 7 additions & 7 deletions cpp/src/arrow/type_traits.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ struct CTypeTraits<bool> : public TypeTraits<BooleanType> {
using TensorType = ArrowTensorType; \
using CType = CType_; \
static constexpr int64_t bytes_required(int64_t elements) { \
return elements * sizeof(CType_); \
return elements * static_cast<int64_t>(sizeof(CType_)); \
} \
constexpr static bool is_parameter_free = true; \
static inline std::shared_ptr<DataType> type_singleton() { return SingletonFn(); } \
Expand DownExpand Up@@ -113,7 +113,7 @@ struct TypeTraits<Date64Type> {
using ScalarType = Date64Scalar;

static constexpr int64_t bytes_required(int64_t elements) {
return elements * sizeof(int64_t);
return elements * static_cast<int64_t>(sizeof(int64_t));
}
constexpr static bool is_parameter_free = true;
static inline std::shared_ptr<DataType> type_singleton() { return date64(); }
Expand All@@ -126,7 +126,7 @@ struct TypeTraits<Date32Type> {
using ScalarType = Date32Scalar;

static constexpr int64_t bytes_required(int64_t elements) {
return elements * sizeof(int32_t);
return elements * static_cast<int64_t>(sizeof(int32_t));
}
constexpr static bool is_parameter_free = true;
static inline std::shared_ptr<DataType> type_singleton() { return date32(); }
Expand All@@ -139,7 +139,7 @@ struct TypeTraits<TimestampType> {
using ScalarType = TimestampScalar;

static constexpr int64_t bytes_required(int64_t elements) {
return elements * sizeof(int64_t);
return elements * static_cast<int64_t>(sizeof(int64_t));
}
constexpr static bool is_parameter_free = false;
};
Expand All@@ -151,7 +151,7 @@ struct TypeTraits<Time32Type> {
using ScalarType = Time32Scalar;

static constexpr int64_t bytes_required(int64_t elements) {
return elements * sizeof(int32_t);
return elements * static_cast<int64_t>(sizeof(int32_t));
}
constexpr static bool is_parameter_free = false;
};
Expand All@@ -163,7 +163,7 @@ struct TypeTraits<Time64Type> {
using ScalarType = Time64Scalar;

static constexpr int64_t bytes_required(int64_t elements) {
return elements * sizeof(int64_t);
return elements * static_cast<int64_t>(sizeof(int64_t));
}
constexpr static bool is_parameter_free = false;
};
Expand All@@ -176,7 +176,7 @@ struct TypeTraits<HalfFloatType> {
using TensorType = HalfFloatTensor;

static constexpr int64_t bytes_required(int64_t elements) {
return elements * sizeof(uint16_t);
return elements * static_cast<int64_t>(sizeof(uint16_t));
}
constexpr static bool is_parameter_free = true;
static inline std::shared_ptr<DataType> type_singleton() { return float16(); }
Expand Down
19 changes: 12 additions & 7 deletions cpp/src/arrow/util/compression_brotli.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,9 +204,11 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
int64_t output_buffer_len, uint8_t* output_buffer,
int64_t* output_len) {
std::size_t output_size = output_buffer_len;
if (BrotliDecoderDecompress(input_len, input, &output_size, output_buffer) !=
BROTLI_DECODER_RESULT_SUCCESS) {
DCHECK_GE(input_len, 0);
DCHECK_GE(output_buffer_len, 0);
std::size_t output_size = static_cast<size_t>(output_buffer_len);
if (BrotliDecoderDecompress(static_cast<size_t>(input_len), input, &output_size,
output_buffer) != BROTLI_DECODER_RESULT_SUCCESS) {
return Status::IOError("Corrupt brotli compressed data.");
}
if (output_len) {
Expand All@@ -217,16 +219,19 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t BrotliCodec::MaxCompressedLen(int64_t input_len,
const uint8_t* ARROW_ARG_UNUSED(input)) {
return BrotliEncoderMaxCompressedSize(input_len);
DCHECK_GE(input_len, 0);
return BrotliEncoderMaxCompressedSize(static_cast<size_t>(input_len));
}

Status BrotliCodec::Compress(int64_t input_len, const uint8_t* input,
int64_t output_buffer_len, uint8_t* output_buffer,
int64_t* output_len) {
std::size_t output_size = output_buffer_len;
DCHECK_GE(input_len, 0);
DCHECK_GE(output_buffer_len, 0);
std::size_t output_size = static_cast<size_t>(output_buffer_len);
if (BrotliEncoderCompress(kBrotliDefaultCompressionLevel, BROTLI_DEFAULT_WINDOW,
BROTLI_DEFAULT_MODE, input_len, input, &output_size,
output_buffer) == BROTLI_FALSE) {
BROTLI_DEFAULT_MODE, static_cast<size_t>(input_len), input,
&output_size, output_buffer) == BROTLI_FALSE) {
return Status::IOError("Brotli compression failure.");
}
*output_len = output_size;
Expand Down
4 changes: 3 additions & 1 deletion cpp/src/arrow/util/compression_snappy.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <snappy.h>

#include "arrow/status.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"

using std::size_t;
Expand DownExpand Up@@ -73,7 +74,8 @@ Status SnappyCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t SnappyCodec::MaxCompressedLen(int64_t input_len,
const uint8_t* ARROW_ARG_UNUSED(input)) {
return snappy::MaxCompressedLength(input_len);
DCHECK_GE(input_len, 0);
return snappy::MaxCompressedLength(static_cast<size_t>(input_len));
}

Status SnappyCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/util/compression_zstd.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,8 @@ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t ZSTDCodec::MaxCompressedLen(int64_t input_len,
const uint8_t* ARROW_ARG_UNUSED(input)) {
return ZSTD_compressBound(input_len);
DCHECK_GE(input_len, 0);
return ZSTD_compressBound(static_cast<size_t>(input_len));
}

Status ZSTDCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings#3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

emkornfield
wants to merge
4
commits into

from

 Closed


ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings
#3793
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
86d1693

ARROW-4744: [C++][CI] Add static cast to input_len to avoid warning


emkornfield Mar 2, 2019
96e127e

Fix other places where cast was happening


emkornfield Mar 2, 2019
6b7c1f4

more brotli fixes


emkornfield Mar 2, 2019
0dd4e6f

Change mingw back to release. Cleanup some more conversion errors


emkornfield Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
ci/appveyor-cpp-build-mingw.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@

@echo on

set CMAKE_BUILD_TYPE=debug
set MESON_BUILD_TYPE=debug
set CMAKE_BUILD_TYPE=release
set MESON_BUILD_TYPE=release

set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
Expand Down

14 changes: 7 additions & 7 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ struct CTypeTraits<bool> : public TypeTraits<BooleanType> {
 using TensorType = ArrowTensorType; \
 using CType = CType_; \
 static constexpr int64_t bytes_required(int64_t elements) { \
 return elements * sizeof(CType_);  \
 return elements * static_cast<int64_t>(sizeof(CType_)); \
 } \
 constexpr static bool is_parameter_free = true; \
 static inline std::shared_ptr<DataType> type_singleton() { return SingletonFn(); } \
Expand DownExpand Up@@ -113,7 +113,7 @@ struct TypeTraits<Date64Type> {
 using ScalarType = Date64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date64(); }
Expand All@@ -126,7 +126,7 @@ struct TypeTraits<Date32Type> {
 using ScalarType = Date32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date32(); }
Expand All@@ -139,7 +139,7 @@ struct TypeTraits<TimestampType> {
 using ScalarType = TimestampScalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -151,7 +151,7 @@ struct TypeTraits<Time32Type> {
 using ScalarType = Time32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -163,7 +163,7 @@ struct TypeTraits<Time64Type> {
 using ScalarType = Time64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -176,7 +176,7 @@ struct TypeTraits<HalfFloatType> {
 using TensorType = HalfFloatTensor;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(uint16_t);
 return elements * static_cast<int64_t>(sizeof(uint16_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return float16(); }
Expand Down

19 changes: 12 additions & 7 deletions
cpp/src/arrow/util/compression_brotli.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,9 +204,11 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 if (BrotliDecoderDecompress(input_len, input, &output_size, output_buffer) !=
 BROTLI_DECODER_RESULT_SUCCESS) {
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliDecoderDecompress(static_cast<size_t>(input_len), input, &output_size,
 output_buffer) != BROTLI_DECODER_RESULT_SUCCESS) {
 return Status::IOError("Corrupt brotli compressed data.");
 }
 if (output_len) {
Expand All@@ -217,16 +219,19 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t BrotliCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return BrotliEncoderMaxCompressedSize(input_len);
 DCHECK_GE(input_len, 0);
 return BrotliEncoderMaxCompressedSize(static_cast<size_t>(input_len));
}

Status BrotliCodec::Compress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliEncoderCompress(kBrotliDefaultCompressionLevel, BROTLI_DEFAULT_WINDOW,
 BROTLI_DEFAULT_MODE, input_len, input, &output_size,
 output_buffer) == BROTLI_FALSE) {
 BROTLI_DEFAULT_MODE, static_cast<size_t>(input_len), input,
&output_size, output_buffer) == BROTLI_FALSE) {
 return Status::IOError("Brotli compression failure.");
 }
 *output_len = output_size;
Expand Down

4 changes: 3 additions & 1 deletion
cpp/src/arrow/util/compression_snappy.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <snappy.h>

#include "arrow/status.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"

using std::size_t;
Expand DownExpand Up@@ -73,7 +74,8 @@ Status SnappyCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t SnappyCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return snappy::MaxCompressedLength(input_len);
 DCHECK_GE(input_len, 0);
 return snappy::MaxCompressedLength(static_cast<size_t>(input_len));
}

Status SnappyCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/util/compression_zstd.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,8 @@ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t ZSTDCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return ZSTD_compressBound(input_len);
 DCHECK_GE(input_len, 0);
 return ZSTD_compressBound(static_cast<size_t>(input_len));
}

Status ZSTDCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings#3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

emkornfield
wants to merge
4
commits into

from

 Closed


ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings
#3793
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
86d1693

ARROW-4744: [C++][CI] Add static cast to input_len to avoid warning


emkornfield Mar 2, 2019
96e127e

Fix other places where cast was happening


emkornfield Mar 2, 2019
6b7c1f4

more brotli fixes


emkornfield Mar 2, 2019
0dd4e6f

Change mingw back to release. Cleanup some more conversion errors


emkornfield Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
ci/appveyor-cpp-build-mingw.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@

@echo on

set CMAKE_BUILD_TYPE=debug
set MESON_BUILD_TYPE=debug
set CMAKE_BUILD_TYPE=release
set MESON_BUILD_TYPE=release

set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
Expand Down

14 changes: 7 additions & 7 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ struct CTypeTraits<bool> : public TypeTraits<BooleanType> {
 using TensorType = ArrowTensorType; \
 using CType = CType_; \
 static constexpr int64_t bytes_required(int64_t elements) { \
 return elements * sizeof(CType_);  \
 return elements * static_cast<int64_t>(sizeof(CType_)); \
 } \
 constexpr static bool is_parameter_free = true; \
 static inline std::shared_ptr<DataType> type_singleton() { return SingletonFn(); } \
Expand DownExpand Up@@ -113,7 +113,7 @@ struct TypeTraits<Date64Type> {
 using ScalarType = Date64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date64(); }
Expand All@@ -126,7 +126,7 @@ struct TypeTraits<Date32Type> {
 using ScalarType = Date32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date32(); }
Expand All@@ -139,7 +139,7 @@ struct TypeTraits<TimestampType> {
 using ScalarType = TimestampScalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -151,7 +151,7 @@ struct TypeTraits<Time32Type> {
 using ScalarType = Time32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -163,7 +163,7 @@ struct TypeTraits<Time64Type> {
 using ScalarType = Time64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -176,7 +176,7 @@ struct TypeTraits<HalfFloatType> {
 using TensorType = HalfFloatTensor;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(uint16_t);
 return elements * static_cast<int64_t>(sizeof(uint16_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return float16(); }
Expand Down

19 changes: 12 additions & 7 deletions
cpp/src/arrow/util/compression_brotli.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,9 +204,11 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 if (BrotliDecoderDecompress(input_len, input, &output_size, output_buffer) !=
 BROTLI_DECODER_RESULT_SUCCESS) {
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliDecoderDecompress(static_cast<size_t>(input_len), input, &output_size,
 output_buffer) != BROTLI_DECODER_RESULT_SUCCESS) {
 return Status::IOError("Corrupt brotli compressed data.");
 }
 if (output_len) {
Expand All@@ -217,16 +219,19 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t BrotliCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return BrotliEncoderMaxCompressedSize(input_len);
 DCHECK_GE(input_len, 0);
 return BrotliEncoderMaxCompressedSize(static_cast<size_t>(input_len));
}

Status BrotliCodec::Compress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliEncoderCompress(kBrotliDefaultCompressionLevel, BROTLI_DEFAULT_WINDOW,
 BROTLI_DEFAULT_MODE, input_len, input, &output_size,
 output_buffer) == BROTLI_FALSE) {
 BROTLI_DEFAULT_MODE, static_cast<size_t>(input_len), input,
&output_size, output_buffer) == BROTLI_FALSE) {
 return Status::IOError("Brotli compression failure.");
 }
 *output_len = output_size;
Expand Down

4 changes: 3 additions & 1 deletion
cpp/src/arrow/util/compression_snappy.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <snappy.h>

#include "arrow/status.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"

using std::size_t;
Expand DownExpand Up@@ -73,7 +74,8 @@ Status SnappyCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t SnappyCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return snappy::MaxCompressedLength(input_len);
 DCHECK_GE(input_len, 0);
 return snappy::MaxCompressedLength(static_cast<size_t>(input_len));
}

Status SnappyCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/util/compression_zstd.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,8 @@ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t ZSTDCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return ZSTD_compressBound(input_len);
 DCHECK_GE(input_len, 0);
 return ZSTD_compressBound(static_cast<size_t>(input_len));
}

Status ZSTDCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings#3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

emkornfield
wants to merge
4
commits into

from

 Closed


ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings
#3793
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
86d1693

ARROW-4744: [C++][CI] Add static cast to input_len to avoid warning


emkornfield Mar 2, 2019
96e127e

Fix other places where cast was happening


emkornfield Mar 2, 2019
6b7c1f4

more brotli fixes


emkornfield Mar 2, 2019
0dd4e6f

Change mingw back to release. Cleanup some more conversion errors


emkornfield Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
ci/appveyor-cpp-build-mingw.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@

@echo on

set CMAKE_BUILD_TYPE=debug
set MESON_BUILD_TYPE=debug
set CMAKE_BUILD_TYPE=release
set MESON_BUILD_TYPE=release

set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
Expand Down

14 changes: 7 additions & 7 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ struct CTypeTraits<bool> : public TypeTraits<BooleanType> {
 using TensorType = ArrowTensorType; \
 using CType = CType_; \
 static constexpr int64_t bytes_required(int64_t elements) { \
 return elements * sizeof(CType_);  \
 return elements * static_cast<int64_t>(sizeof(CType_)); \
 } \
 constexpr static bool is_parameter_free = true; \
 static inline std::shared_ptr<DataType> type_singleton() { return SingletonFn(); } \
Expand DownExpand Up@@ -113,7 +113,7 @@ struct TypeTraits<Date64Type> {
 using ScalarType = Date64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date64(); }
Expand All@@ -126,7 +126,7 @@ struct TypeTraits<Date32Type> {
 using ScalarType = Date32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date32(); }
Expand All@@ -139,7 +139,7 @@ struct TypeTraits<TimestampType> {
 using ScalarType = TimestampScalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -151,7 +151,7 @@ struct TypeTraits<Time32Type> {
 using ScalarType = Time32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -163,7 +163,7 @@ struct TypeTraits<Time64Type> {
 using ScalarType = Time64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -176,7 +176,7 @@ struct TypeTraits<HalfFloatType> {
 using TensorType = HalfFloatTensor;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(uint16_t);
 return elements * static_cast<int64_t>(sizeof(uint16_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return float16(); }
Expand Down

19 changes: 12 additions & 7 deletions
cpp/src/arrow/util/compression_brotli.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,9 +204,11 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 if (BrotliDecoderDecompress(input_len, input, &output_size, output_buffer) !=
 BROTLI_DECODER_RESULT_SUCCESS) {
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliDecoderDecompress(static_cast<size_t>(input_len), input, &output_size,
 output_buffer) != BROTLI_DECODER_RESULT_SUCCESS) {
 return Status::IOError("Corrupt brotli compressed data.");
 }
 if (output_len) {
Expand All@@ -217,16 +219,19 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t BrotliCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return BrotliEncoderMaxCompressedSize(input_len);
 DCHECK_GE(input_len, 0);
 return BrotliEncoderMaxCompressedSize(static_cast<size_t>(input_len));
}

Status BrotliCodec::Compress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliEncoderCompress(kBrotliDefaultCompressionLevel, BROTLI_DEFAULT_WINDOW,
 BROTLI_DEFAULT_MODE, input_len, input, &output_size,
 output_buffer) == BROTLI_FALSE) {
 BROTLI_DEFAULT_MODE, static_cast<size_t>(input_len), input,
&output_size, output_buffer) == BROTLI_FALSE) {
 return Status::IOError("Brotli compression failure.");
 }
 *output_len = output_size;
Expand Down

4 changes: 3 additions & 1 deletion
cpp/src/arrow/util/compression_snappy.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <snappy.h>

#include "arrow/status.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"

using std::size_t;
Expand DownExpand Up@@ -73,7 +74,8 @@ Status SnappyCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t SnappyCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return snappy::MaxCompressedLength(input_len);
 DCHECK_GE(input_len, 0);
 return snappy::MaxCompressedLength(static_cast<size_t>(input_len));
}

Status SnappyCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/util/compression_zstd.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,8 @@ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t ZSTDCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return ZSTD_compressBound(input_len);
 DCHECK_GE(input_len, 0);
 return ZSTD_compressBound(static_cast<size_t>(input_len));
}

Status ZSTDCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings#3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

emkornfield
wants to merge
4
commits into

from

 Closed


ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings
#3793
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
86d1693

ARROW-4744: [C++][CI] Add static cast to input_len to avoid warning


emkornfield Mar 2, 2019
96e127e

Fix other places where cast was happening


emkornfield Mar 2, 2019
6b7c1f4

more brotli fixes


emkornfield Mar 2, 2019
0dd4e6f

Change mingw back to release. Cleanup some more conversion errors


emkornfield Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
ci/appveyor-cpp-build-mingw.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@

@echo on

set CMAKE_BUILD_TYPE=debug
set MESON_BUILD_TYPE=debug
set CMAKE_BUILD_TYPE=release
set MESON_BUILD_TYPE=release

set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
Expand Down

14 changes: 7 additions & 7 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ struct CTypeTraits<bool> : public TypeTraits<BooleanType> {
 using TensorType = ArrowTensorType; \
 using CType = CType_; \
 static constexpr int64_t bytes_required(int64_t elements) { \
 return elements * sizeof(CType_);  \
 return elements * static_cast<int64_t>(sizeof(CType_)); \
 } \
 constexpr static bool is_parameter_free = true; \
 static inline std::shared_ptr<DataType> type_singleton() { return SingletonFn(); } \
Expand DownExpand Up@@ -113,7 +113,7 @@ struct TypeTraits<Date64Type> {
 using ScalarType = Date64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date64(); }
Expand All@@ -126,7 +126,7 @@ struct TypeTraits<Date32Type> {
 using ScalarType = Date32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date32(); }
Expand All@@ -139,7 +139,7 @@ struct TypeTraits<TimestampType> {
 using ScalarType = TimestampScalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -151,7 +151,7 @@ struct TypeTraits<Time32Type> {
 using ScalarType = Time32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -163,7 +163,7 @@ struct TypeTraits<Time64Type> {
 using ScalarType = Time64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -176,7 +176,7 @@ struct TypeTraits<HalfFloatType> {
 using TensorType = HalfFloatTensor;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(uint16_t);
 return elements * static_cast<int64_t>(sizeof(uint16_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return float16(); }
Expand Down

19 changes: 12 additions & 7 deletions
cpp/src/arrow/util/compression_brotli.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,9 +204,11 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 if (BrotliDecoderDecompress(input_len, input, &output_size, output_buffer) !=
 BROTLI_DECODER_RESULT_SUCCESS) {
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliDecoderDecompress(static_cast<size_t>(input_len), input, &output_size,
 output_buffer) != BROTLI_DECODER_RESULT_SUCCESS) {
 return Status::IOError("Corrupt brotli compressed data.");
 }
 if (output_len) {
Expand All@@ -217,16 +219,19 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t BrotliCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return BrotliEncoderMaxCompressedSize(input_len);
 DCHECK_GE(input_len, 0);
 return BrotliEncoderMaxCompressedSize(static_cast<size_t>(input_len));
}

Status BrotliCodec::Compress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliEncoderCompress(kBrotliDefaultCompressionLevel, BROTLI_DEFAULT_WINDOW,
 BROTLI_DEFAULT_MODE, input_len, input, &output_size,
 output_buffer) == BROTLI_FALSE) {
 BROTLI_DEFAULT_MODE, static_cast<size_t>(input_len), input,
&output_size, output_buffer) == BROTLI_FALSE) {
 return Status::IOError("Brotli compression failure.");
 }
 *output_len = output_size;
Expand Down

4 changes: 3 additions & 1 deletion
cpp/src/arrow/util/compression_snappy.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <snappy.h>

#include "arrow/status.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"

using std::size_t;
Expand DownExpand Up@@ -73,7 +74,8 @@ Status SnappyCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t SnappyCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return snappy::MaxCompressedLength(input_len);
 DCHECK_GE(input_len, 0);
 return snappy::MaxCompressedLength(static_cast<size_t>(input_len));
}

Status SnappyCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/util/compression_zstd.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,8 @@ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t ZSTDCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return ZSTD_compressBound(input_len);
 DCHECK_GE(input_len, 0);
 return ZSTD_compressBound(static_cast<size_t>(input_len));
}

Status ZSTDCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings#3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

emkornfield
wants to merge
4
commits into

from

 Closed


ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings
#3793
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
86d1693

ARROW-4744: [C++][CI] Add static cast to input_len to avoid warning


emkornfield Mar 2, 2019
96e127e

Fix other places where cast was happening


emkornfield Mar 2, 2019
6b7c1f4

more brotli fixes


emkornfield Mar 2, 2019
0dd4e6f

Change mingw back to release. Cleanup some more conversion errors


emkornfield Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
ci/appveyor-cpp-build-mingw.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@

@echo on

set CMAKE_BUILD_TYPE=debug
set MESON_BUILD_TYPE=debug
set CMAKE_BUILD_TYPE=release
set MESON_BUILD_TYPE=release

set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
Expand Down

14 changes: 7 additions & 7 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ struct CTypeTraits<bool> : public TypeTraits<BooleanType> {
 using TensorType = ArrowTensorType; \
 using CType = CType_; \
 static constexpr int64_t bytes_required(int64_t elements) { \
 return elements * sizeof(CType_);  \
 return elements * static_cast<int64_t>(sizeof(CType_)); \
 } \
 constexpr static bool is_parameter_free = true; \
 static inline std::shared_ptr<DataType> type_singleton() { return SingletonFn(); } \
Expand DownExpand Up@@ -113,7 +113,7 @@ struct TypeTraits<Date64Type> {
 using ScalarType = Date64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date64(); }
Expand All@@ -126,7 +126,7 @@ struct TypeTraits<Date32Type> {
 using ScalarType = Date32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date32(); }
Expand All@@ -139,7 +139,7 @@ struct TypeTraits<TimestampType> {
 using ScalarType = TimestampScalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -151,7 +151,7 @@ struct TypeTraits<Time32Type> {
 using ScalarType = Time32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -163,7 +163,7 @@ struct TypeTraits<Time64Type> {
 using ScalarType = Time64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -176,7 +176,7 @@ struct TypeTraits<HalfFloatType> {
 using TensorType = HalfFloatTensor;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(uint16_t);
 return elements * static_cast<int64_t>(sizeof(uint16_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return float16(); }
Expand Down

19 changes: 12 additions & 7 deletions
cpp/src/arrow/util/compression_brotli.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,9 +204,11 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 if (BrotliDecoderDecompress(input_len, input, &output_size, output_buffer) !=
 BROTLI_DECODER_RESULT_SUCCESS) {
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliDecoderDecompress(static_cast<size_t>(input_len), input, &output_size,
 output_buffer) != BROTLI_DECODER_RESULT_SUCCESS) {
 return Status::IOError("Corrupt brotli compressed data.");
 }
 if (output_len) {
Expand All@@ -217,16 +219,19 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t BrotliCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return BrotliEncoderMaxCompressedSize(input_len);
 DCHECK_GE(input_len, 0);
 return BrotliEncoderMaxCompressedSize(static_cast<size_t>(input_len));
}

Status BrotliCodec::Compress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliEncoderCompress(kBrotliDefaultCompressionLevel, BROTLI_DEFAULT_WINDOW,
 BROTLI_DEFAULT_MODE, input_len, input, &output_size,
 output_buffer) == BROTLI_FALSE) {
 BROTLI_DEFAULT_MODE, static_cast<size_t>(input_len), input,
&output_size, output_buffer) == BROTLI_FALSE) {
 return Status::IOError("Brotli compression failure.");
 }
 *output_len = output_size;
Expand Down

4 changes: 3 additions & 1 deletion
cpp/src/arrow/util/compression_snappy.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <snappy.h>

#include "arrow/status.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"

using std::size_t;
Expand DownExpand Up@@ -73,7 +74,8 @@ Status SnappyCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t SnappyCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return snappy::MaxCompressedLength(input_len);
 DCHECK_GE(input_len, 0);
 return snappy::MaxCompressedLength(static_cast<size_t>(input_len));
}

Status SnappyCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/util/compression_zstd.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,8 @@ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t ZSTDCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return ZSTD_compressBound(input_len);
 DCHECK_GE(input_len, 0);
 return ZSTD_compressBound(static_cast<size_t>(input_len));
}

Status ZSTDCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings#3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

emkornfield
wants to merge
4
commits into

from

 Closed


ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings
#3793
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
86d1693

ARROW-4744: [C++][CI] Add static cast to input_len to avoid warning


emkornfield Mar 2, 2019
96e127e

Fix other places where cast was happening


emkornfield Mar 2, 2019
6b7c1f4

more brotli fixes


emkornfield Mar 2, 2019
0dd4e6f

Change mingw back to release. Cleanup some more conversion errors


emkornfield Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
ci/appveyor-cpp-build-mingw.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@

@echo on

set CMAKE_BUILD_TYPE=debug
set MESON_BUILD_TYPE=debug
set CMAKE_BUILD_TYPE=release
set MESON_BUILD_TYPE=release

set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
Expand Down

14 changes: 7 additions & 7 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ struct CTypeTraits<bool> : public TypeTraits<BooleanType> {
 using TensorType = ArrowTensorType; \
 using CType = CType_; \
 static constexpr int64_t bytes_required(int64_t elements) { \
 return elements * sizeof(CType_);  \
 return elements * static_cast<int64_t>(sizeof(CType_)); \
 } \
 constexpr static bool is_parameter_free = true; \
 static inline std::shared_ptr<DataType> type_singleton() { return SingletonFn(); } \
Expand DownExpand Up@@ -113,7 +113,7 @@ struct TypeTraits<Date64Type> {
 using ScalarType = Date64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date64(); }
Expand All@@ -126,7 +126,7 @@ struct TypeTraits<Date32Type> {
 using ScalarType = Date32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date32(); }
Expand All@@ -139,7 +139,7 @@ struct TypeTraits<TimestampType> {
 using ScalarType = TimestampScalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -151,7 +151,7 @@ struct TypeTraits<Time32Type> {
 using ScalarType = Time32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -163,7 +163,7 @@ struct TypeTraits<Time64Type> {
 using ScalarType = Time64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -176,7 +176,7 @@ struct TypeTraits<HalfFloatType> {
 using TensorType = HalfFloatTensor;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(uint16_t);
 return elements * static_cast<int64_t>(sizeof(uint16_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return float16(); }
Expand Down

19 changes: 12 additions & 7 deletions
cpp/src/arrow/util/compression_brotli.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,9 +204,11 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 if (BrotliDecoderDecompress(input_len, input, &output_size, output_buffer) !=
 BROTLI_DECODER_RESULT_SUCCESS) {
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliDecoderDecompress(static_cast<size_t>(input_len), input, &output_size,
 output_buffer) != BROTLI_DECODER_RESULT_SUCCESS) {
 return Status::IOError("Corrupt brotli compressed data.");
 }
 if (output_len) {
Expand All@@ -217,16 +219,19 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t BrotliCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return BrotliEncoderMaxCompressedSize(input_len);
 DCHECK_GE(input_len, 0);
 return BrotliEncoderMaxCompressedSize(static_cast<size_t>(input_len));
}

Status BrotliCodec::Compress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliEncoderCompress(kBrotliDefaultCompressionLevel, BROTLI_DEFAULT_WINDOW,
 BROTLI_DEFAULT_MODE, input_len, input, &output_size,
 output_buffer) == BROTLI_FALSE) {
 BROTLI_DEFAULT_MODE, static_cast<size_t>(input_len), input,
&output_size, output_buffer) == BROTLI_FALSE) {
 return Status::IOError("Brotli compression failure.");
 }
 *output_len = output_size;
Expand Down

4 changes: 3 additions & 1 deletion
cpp/src/arrow/util/compression_snappy.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <snappy.h>

#include "arrow/status.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"

using std::size_t;
Expand DownExpand Up@@ -73,7 +74,8 @@ Status SnappyCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t SnappyCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return snappy::MaxCompressedLength(input_len);
 DCHECK_GE(input_len, 0);
 return snappy::MaxCompressedLength(static_cast<size_t>(input_len));
}

Status SnappyCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/util/compression_zstd.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,8 @@ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t ZSTDCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return ZSTD_compressBound(input_len);
 DCHECK_GE(input_len, 0);
 return ZSTD_compressBound(static_cast<size_t>(input_len));
}

Status ZSTDCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings#3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

emkornfield
wants to merge
4
commits into

from

 Closed


ARROW-4744: [C++][CI] Change mingw builds back to debug. Cleanup up some version warnings
#3793
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
86d1693

ARROW-4744: [C++][CI] Add static cast to input_len to avoid warning


emkornfield Mar 2, 2019
96e127e

Fix other places where cast was happening


emkornfield Mar 2, 2019
6b7c1f4

more brotli fixes


emkornfield Mar 2, 2019
0dd4e6f

Change mingw back to release. Cleanup some more conversion errors


emkornfield Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
ci/appveyor-cpp-build-mingw.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@

@echo on

set CMAKE_BUILD_TYPE=debug
set MESON_BUILD_TYPE=debug
set CMAKE_BUILD_TYPE=release
set MESON_BUILD_TYPE=release

set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install
set PATH=%INSTALL_DIR%\bin;%PATH%
Expand Down

14 changes: 7 additions & 7 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,7 @@ struct CTypeTraits<bool> : public TypeTraits<BooleanType> {
 using TensorType = ArrowTensorType; \
 using CType = CType_; \
 static constexpr int64_t bytes_required(int64_t elements) { \
 return elements * sizeof(CType_);  \
 return elements * static_cast<int64_t>(sizeof(CType_)); \
 } \
 constexpr static bool is_parameter_free = true; \
 static inline std::shared_ptr<DataType> type_singleton() { return SingletonFn(); } \
Expand DownExpand Up@@ -113,7 +113,7 @@ struct TypeTraits<Date64Type> {
 using ScalarType = Date64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date64(); }
Expand All@@ -126,7 +126,7 @@ struct TypeTraits<Date32Type> {
 using ScalarType = Date32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return date32(); }
Expand All@@ -139,7 +139,7 @@ struct TypeTraits<TimestampType> {
 using ScalarType = TimestampScalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -151,7 +151,7 @@ struct TypeTraits<Time32Type> {
 using ScalarType = Time32Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int32_t);
 return elements * static_cast<int64_t>(sizeof(int32_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -163,7 +163,7 @@ struct TypeTraits<Time64Type> {
 using ScalarType = Time64Scalar;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(int64_t);
 return elements * static_cast<int64_t>(sizeof(int64_t));
 }
 constexpr static bool is_parameter_free = false;
};
Expand All@@ -176,7 +176,7 @@ struct TypeTraits<HalfFloatType> {
 using TensorType = HalfFloatTensor;

 static constexpr int64_t bytes_required(int64_t elements) {
 return elements * sizeof(uint16_t);
 return elements * static_cast<int64_t>(sizeof(uint16_t));
 }
 constexpr static bool is_parameter_free = true;
 static inline std::shared_ptr<DataType> type_singleton() { return float16(); }
Expand Down

19 changes: 12 additions & 7 deletions
cpp/src/arrow/util/compression_brotli.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,9 +204,11 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 if (BrotliDecoderDecompress(input_len, input, &output_size, output_buffer) !=
 BROTLI_DECODER_RESULT_SUCCESS) {
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliDecoderDecompress(static_cast<size_t>(input_len), input, &output_size,
 output_buffer) != BROTLI_DECODER_RESULT_SUCCESS) {
 return Status::IOError("Corrupt brotli compressed data.");
 }
 if (output_len) {
Expand All@@ -217,16 +219,19 @@ Status BrotliCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t BrotliCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return BrotliEncoderMaxCompressedSize(input_len);
 DCHECK_GE(input_len, 0);
 return BrotliEncoderMaxCompressedSize(static_cast<size_t>(input_len));
}

Status BrotliCodec::Compress(int64_t input_len, const uint8_t* input,
 int64_t output_buffer_len, uint8_t* output_buffer,
 int64_t* output_len) {
 std::size_t output_size = output_buffer_len;
 DCHECK_GE(input_len, 0);
 DCHECK_GE(output_buffer_len, 0);
 std::size_t output_size = static_cast<size_t>(output_buffer_len);
 if (BrotliEncoderCompress(kBrotliDefaultCompressionLevel, BROTLI_DEFAULT_WINDOW,
 BROTLI_DEFAULT_MODE, input_len, input, &output_size,
 output_buffer) == BROTLI_FALSE) {
 BROTLI_DEFAULT_MODE, static_cast<size_t>(input_len), input,
&output_size, output_buffer) == BROTLI_FALSE) {
 return Status::IOError("Brotli compression failure.");
 }
 *output_len = output_size;
Expand Down

4 changes: 3 additions & 1 deletion
cpp/src/arrow/util/compression_snappy.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
#include <snappy.h>

#include "arrow/status.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"

using std::size_t;
Expand DownExpand Up@@ -73,7 +74,8 @@ Status SnappyCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t SnappyCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return snappy::MaxCompressedLength(input_len);
 DCHECK_GE(input_len, 0);
 return snappy::MaxCompressedLength(static_cast<size_t>(input_len));
}

Status SnappyCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down

3 changes: 2 additions & 1 deletion
cpp/src/arrow/util/compression_zstd.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,8 @@ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input,

int64_t ZSTDCodec::MaxCompressedLen(int64_t input_len,
 const uint8_t* ARROW_ARG_UNUSED(input)) {
 return ZSTD_compressBound(input_len);
 DCHECK_GE(input_len, 0);
 return ZSTD_compressBound(static_cast<size_t>(input_len));
}

Status ZSTDCodec::Compress(int64_t input_len, const uint8_t* input,
Expand Down