ARROW-13760: [C++] Bump required Protobuf when using Flight#11006

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
lidavidm wants to merge 8 commits into from
Closed

ARROW-13760: [C++] Bump required Protobuf when using Flight #11006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3373def
ARROW-13760: [C++] Bump required Protobuf when using Flight
lidavidm Aug 25, 2021
ee7ca51
ARROW-13760: [C++] Update comment
lidavidm Aug 25, 2021
8ed8f84
ARROW-13760: [C++] Bundle Protobuf where appropriate
lidavidm Aug 26, 2021
fc8aec2
ARROW-13760: [C++] Attempt to fix ubuntu-hirsute-amd64
lidavidm Aug 26, 2021
7fd4e19
ARROW-13760: [C++] Revert previous attempt
lidavidm Aug 27, 2021
c97ae11
ARROW-13760: [C++] Strip LTO flags from Protobuf build
lidavidm Aug 27, 2021
1933598
ARROW-13760: [C++] Lint
lidavidm Aug 27, 2021
9cb44e2
ARROW-13760: [C++] Remove debug flag
lidavidm Aug 30, 2021
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
18 changes: 15 additions & 3 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1371,13 +1371,25 @@ macro(build_protobuf)
BUILD_COMMAND
${PROTOBUF_BUILD_COMMAND})
else()
# Strip lto flags (which may be added by dh_auto_configure)
# See https://github.com/protocolbuffers/protobuf/issues/7092
set(PROTOBUF_C_FLAGS ${EP_C_FLAGS})
set(PROTOBUF_CXX_FLAGS ${EP_CXX_FLAGS})
string(REPLACE "-flto=auto" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
string(REPLACE "-ffat-lto-objects" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
string(REPLACE "-flto=auto" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
string(REPLACE "-ffat-lto-objects" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
set(PROTOBUF_CMAKE_ARGS
${EP_COMMON_CMAKE_ARGS}
-DBUILD_SHARED_LIBS=OFF
-DCMAKE_INSTALL_LIBDIR=lib
"-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
-Dprotobuf_BUILD_TESTS=OFF
-Dprotobuf_DEBUG_POSTFIX=)
-Dprotobuf_DEBUG_POSTFIX=
"-DCMAKE_C_FLAGS=${PROTOBUF_C_FLAGS}"
"-DCMAKE_CXX_FLAGS=${PROTOBUF_CXX_FLAGS}"
"-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_C_FLAGS}"
"-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_CXX_FLAGS}")
if(MSVC AND NOT ARROW_USE_STATIC_CRT)
list(APPEND PROTOBUF_CMAKE_ARGS "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
endif()
Expand DownExpand Up@@ -1420,8 +1432,8 @@ endmacro()

if(ARROW_WITH_PROTOBUF)
if(ARROW_WITH_GRPC)
# gRPC 1.21.0 or later require Protobuf 3.7.0 or later.
set(ARROW_PROTOBUF_REQUIRED_VERSION "3.7.0")
# FlightSQL uses proto3 optionals, which require 3.15 or later.
set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0")
elseif(ARROW_GANDIVA_JAVA)
# google::protobuf::MessageLite::ByteSize() is deprecated since
# Protobuf 3.4.0.
Expand Down
4 changes: 2 additions & 2 deletions cpp/thirdparty/versions.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_ORC_BUILD_VERSION=1.6.9
ARROW_ORC_BUILD_SHA256_CHECKSUM=2b79f1152454a38abd7b361b407f65689e275f1fb28d4293892e42fbebcc0a9d
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,7 @@ services:
<<: *ccache
ARROW_ENABLE_TIMING_TESTS: # inherit
ARROW_MIMALLOC: "ON"
Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
volumes: &fedora-volumes
- .:/arrow:delegated
- ${DOCKER_VOLUME_PREFIX}fedora-ccache:/ccache:delegated
Expand DownExpand Up@@ -687,6 +688,7 @@ services:
shm_size: *shm-size
environment:
<<: *ccache
Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
volumes: *fedora-volumes
command: *python-command

Expand DownExpand Up@@ -1353,6 +1355,7 @@ services:
<<: *ccache
ARROW_CUDA: "ON"
ARROW_GLIB_GTK_DOC: "true"
Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
volumes: *ubuntu-volumes
command: &docs-command >
/bin/bash -c "
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-13760: [C++] Bump required Protobuf when using Flight#11006

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

lidavidm
wants to merge
8
commits into

from

 Closed


ARROW-13760: [C++] Bump required Protobuf when using Flight
#11006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
3373def

ARROW-13760: [C++] Bump required Protobuf when using Flight


lidavidm Aug 25, 2021
ee7ca51

ARROW-13760: [C++] Update comment


lidavidm Aug 25, 2021
8ed8f84

ARROW-13760: [C++] Bundle Protobuf where appropriate


lidavidm Aug 26, 2021
fc8aec2

ARROW-13760: [C++] Attempt to fix ubuntu-hirsute-amd64


lidavidm Aug 26, 2021
7fd4e19

ARROW-13760: [C++] Revert previous attempt


lidavidm Aug 27, 2021
c97ae11

ARROW-13760: [C++] Strip LTO flags from Protobuf build


lidavidm Aug 27, 2021
1933598

ARROW-13760: [C++] Lint


lidavidm Aug 27, 2021
9cb44e2

ARROW-13760: [C++] Remove debug flag


lidavidm Aug 30, 2021

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


18 changes: 15 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1371,13 +1371,25 @@ macro(build_protobuf)
 BUILD_COMMAND
 ${PROTOBUF_BUILD_COMMAND})
 else()
 # Strip lto flags (which may be added by dh_auto_configure)
 # See https://github.com/protocolbuffers/protobuf/issues/7092
 set(PROTOBUF_C_FLAGS ${EP_C_FLAGS})
 set(PROTOBUF_CXX_FLAGS ${EP_CXX_FLAGS})
 string(REPLACE "-flto=auto" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-flto=auto" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 set(PROTOBUF_CMAKE_ARGS
 ${EP_COMMON_CMAKE_ARGS}
 -DBUILD_SHARED_LIBS=OFF
 -DCMAKE_INSTALL_LIBDIR=lib
 "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
 -Dprotobuf_BUILD_TESTS=OFF
 -Dprotobuf_DEBUG_POSTFIX=)
 -Dprotobuf_DEBUG_POSTFIX=
 "-DCMAKE_C_FLAGS=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS=${PROTOBUF_CXX_FLAGS}"
 "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_CXX_FLAGS}")
 if(MSVC AND NOT ARROW_USE_STATIC_CRT)
 list(APPEND PROTOBUF_CMAKE_ARGS "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
 endif()
Expand DownExpand Up@@ -1420,8 +1432,8 @@ endmacro()

if(ARROW_WITH_PROTOBUF)
 if(ARROW_WITH_GRPC)
 # gRPC 1.21.0 or later require Protobuf 3.7.0 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.7.0")
 # FlightSQL uses proto3 optionals, which require 3.15 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0")
 elseif(ARROW_GANDIVA_JAVA)
 # google::protobuf::MessageLite::ByteSize() is deprecated since
 # Protobuf 3.4.0.
Expand Down

4 changes: 2 additions & 2 deletions
cpp/thirdparty/versions.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_ORC_BUILD_VERSION=1.6.9
ARROW_ORC_BUILD_SHA256_CHECKSUM=2b79f1152454a38abd7b361b407f65689e275f1fb28d4293892e42fbebcc0a9d
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.
Expand Down

3 changes: 3 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,7 @@ services:
 <<: *ccache
 ARROW_ENABLE_TIMING_TESTS: # inherit
 ARROW_MIMALLOC: "ON"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: &fedora-volumes
 - .:/arrow:delegated
 - ${DOCKER_VOLUME_PREFIX}fedora-ccache:/ccache:delegated
Expand DownExpand Up@@ -687,6 +688,7 @@ services:
 shm_size: *shm-size
 environment:
 <<: *ccache
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *fedora-volumes
 command: *python-command

Expand DownExpand Up@@ -1353,6 +1355,7 @@ services:
 <<: *ccache
 ARROW_CUDA: "ON"
 ARROW_GLIB_GTK_DOC: "true"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *ubuntu-volumes
 command: &docs-command >
 /bin/bash -c "
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-13760: [C++] Bump required Protobuf when using Flight#11006

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

lidavidm
wants to merge
8
commits into

from

 Closed


ARROW-13760: [C++] Bump required Protobuf when using Flight
#11006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
3373def

ARROW-13760: [C++] Bump required Protobuf when using Flight


lidavidm Aug 25, 2021
ee7ca51

ARROW-13760: [C++] Update comment


lidavidm Aug 25, 2021
8ed8f84

ARROW-13760: [C++] Bundle Protobuf where appropriate


lidavidm Aug 26, 2021
fc8aec2

ARROW-13760: [C++] Attempt to fix ubuntu-hirsute-amd64


lidavidm Aug 26, 2021
7fd4e19

ARROW-13760: [C++] Revert previous attempt


lidavidm Aug 27, 2021
c97ae11

ARROW-13760: [C++] Strip LTO flags from Protobuf build


lidavidm Aug 27, 2021
1933598

ARROW-13760: [C++] Lint


lidavidm Aug 27, 2021
9cb44e2

ARROW-13760: [C++] Remove debug flag


lidavidm Aug 30, 2021

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


18 changes: 15 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1371,13 +1371,25 @@ macro(build_protobuf)
 BUILD_COMMAND
 ${PROTOBUF_BUILD_COMMAND})
 else()
 # Strip lto flags (which may be added by dh_auto_configure)
 # See https://github.com/protocolbuffers/protobuf/issues/7092
 set(PROTOBUF_C_FLAGS ${EP_C_FLAGS})
 set(PROTOBUF_CXX_FLAGS ${EP_CXX_FLAGS})
 string(REPLACE "-flto=auto" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-flto=auto" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 set(PROTOBUF_CMAKE_ARGS
 ${EP_COMMON_CMAKE_ARGS}
 -DBUILD_SHARED_LIBS=OFF
 -DCMAKE_INSTALL_LIBDIR=lib
 "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
 -Dprotobuf_BUILD_TESTS=OFF
 -Dprotobuf_DEBUG_POSTFIX=)
 -Dprotobuf_DEBUG_POSTFIX=
 "-DCMAKE_C_FLAGS=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS=${PROTOBUF_CXX_FLAGS}"
 "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_CXX_FLAGS}")
 if(MSVC AND NOT ARROW_USE_STATIC_CRT)
 list(APPEND PROTOBUF_CMAKE_ARGS "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
 endif()
Expand DownExpand Up@@ -1420,8 +1432,8 @@ endmacro()

if(ARROW_WITH_PROTOBUF)
 if(ARROW_WITH_GRPC)
 # gRPC 1.21.0 or later require Protobuf 3.7.0 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.7.0")
 # FlightSQL uses proto3 optionals, which require 3.15 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0")
 elseif(ARROW_GANDIVA_JAVA)
 # google::protobuf::MessageLite::ByteSize() is deprecated since
 # Protobuf 3.4.0.
Expand Down

4 changes: 2 additions & 2 deletions
cpp/thirdparty/versions.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_ORC_BUILD_VERSION=1.6.9
ARROW_ORC_BUILD_SHA256_CHECKSUM=2b79f1152454a38abd7b361b407f65689e275f1fb28d4293892e42fbebcc0a9d
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.
Expand Down

3 changes: 3 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,7 @@ services:
 <<: *ccache
 ARROW_ENABLE_TIMING_TESTS: # inherit
 ARROW_MIMALLOC: "ON"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: &fedora-volumes
 - .:/arrow:delegated
 - ${DOCKER_VOLUME_PREFIX}fedora-ccache:/ccache:delegated
Expand DownExpand Up@@ -687,6 +688,7 @@ services:
 shm_size: *shm-size
 environment:
 <<: *ccache
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *fedora-volumes
 command: *python-command

Expand DownExpand Up@@ -1353,6 +1355,7 @@ services:
 <<: *ccache
 ARROW_CUDA: "ON"
 ARROW_GLIB_GTK_DOC: "true"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *ubuntu-volumes
 command: &docs-command >
 /bin/bash -c "
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-13760: [C++] Bump required Protobuf when using Flight#11006

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

lidavidm
wants to merge
8
commits into

from

 Closed


ARROW-13760: [C++] Bump required Protobuf when using Flight
#11006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
3373def

ARROW-13760: [C++] Bump required Protobuf when using Flight


lidavidm Aug 25, 2021
ee7ca51

ARROW-13760: [C++] Update comment


lidavidm Aug 25, 2021
8ed8f84

ARROW-13760: [C++] Bundle Protobuf where appropriate


lidavidm Aug 26, 2021
fc8aec2

ARROW-13760: [C++] Attempt to fix ubuntu-hirsute-amd64


lidavidm Aug 26, 2021
7fd4e19

ARROW-13760: [C++] Revert previous attempt


lidavidm Aug 27, 2021
c97ae11

ARROW-13760: [C++] Strip LTO flags from Protobuf build


lidavidm Aug 27, 2021
1933598

ARROW-13760: [C++] Lint


lidavidm Aug 27, 2021
9cb44e2

ARROW-13760: [C++] Remove debug flag


lidavidm Aug 30, 2021

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


18 changes: 15 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1371,13 +1371,25 @@ macro(build_protobuf)
 BUILD_COMMAND
 ${PROTOBUF_BUILD_COMMAND})
 else()
 # Strip lto flags (which may be added by dh_auto_configure)
 # See https://github.com/protocolbuffers/protobuf/issues/7092
 set(PROTOBUF_C_FLAGS ${EP_C_FLAGS})
 set(PROTOBUF_CXX_FLAGS ${EP_CXX_FLAGS})
 string(REPLACE "-flto=auto" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-flto=auto" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 set(PROTOBUF_CMAKE_ARGS
 ${EP_COMMON_CMAKE_ARGS}
 -DBUILD_SHARED_LIBS=OFF
 -DCMAKE_INSTALL_LIBDIR=lib
 "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
 -Dprotobuf_BUILD_TESTS=OFF
 -Dprotobuf_DEBUG_POSTFIX=)
 -Dprotobuf_DEBUG_POSTFIX=
 "-DCMAKE_C_FLAGS=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS=${PROTOBUF_CXX_FLAGS}"
 "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_CXX_FLAGS}")
 if(MSVC AND NOT ARROW_USE_STATIC_CRT)
 list(APPEND PROTOBUF_CMAKE_ARGS "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
 endif()
Expand DownExpand Up@@ -1420,8 +1432,8 @@ endmacro()

if(ARROW_WITH_PROTOBUF)
 if(ARROW_WITH_GRPC)
 # gRPC 1.21.0 or later require Protobuf 3.7.0 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.7.0")
 # FlightSQL uses proto3 optionals, which require 3.15 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0")
 elseif(ARROW_GANDIVA_JAVA)
 # google::protobuf::MessageLite::ByteSize() is deprecated since
 # Protobuf 3.4.0.
Expand Down

4 changes: 2 additions & 2 deletions
cpp/thirdparty/versions.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_ORC_BUILD_VERSION=1.6.9
ARROW_ORC_BUILD_SHA256_CHECKSUM=2b79f1152454a38abd7b361b407f65689e275f1fb28d4293892e42fbebcc0a9d
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.
Expand Down

3 changes: 3 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,7 @@ services:
 <<: *ccache
 ARROW_ENABLE_TIMING_TESTS: # inherit
 ARROW_MIMALLOC: "ON"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: &fedora-volumes
 - .:/arrow:delegated
 - ${DOCKER_VOLUME_PREFIX}fedora-ccache:/ccache:delegated
Expand DownExpand Up@@ -687,6 +688,7 @@ services:
 shm_size: *shm-size
 environment:
 <<: *ccache
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *fedora-volumes
 command: *python-command

Expand DownExpand Up@@ -1353,6 +1355,7 @@ services:
 <<: *ccache
 ARROW_CUDA: "ON"
 ARROW_GLIB_GTK_DOC: "true"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *ubuntu-volumes
 command: &docs-command >
 /bin/bash -c "
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-13760: [C++] Bump required Protobuf when using Flight#11006

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

lidavidm
wants to merge
8
commits into

from

 Closed


ARROW-13760: [C++] Bump required Protobuf when using Flight
#11006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
3373def

ARROW-13760: [C++] Bump required Protobuf when using Flight


lidavidm Aug 25, 2021
ee7ca51

ARROW-13760: [C++] Update comment


lidavidm Aug 25, 2021
8ed8f84

ARROW-13760: [C++] Bundle Protobuf where appropriate


lidavidm Aug 26, 2021
fc8aec2

ARROW-13760: [C++] Attempt to fix ubuntu-hirsute-amd64


lidavidm Aug 26, 2021
7fd4e19

ARROW-13760: [C++] Revert previous attempt


lidavidm Aug 27, 2021
c97ae11

ARROW-13760: [C++] Strip LTO flags from Protobuf build


lidavidm Aug 27, 2021
1933598

ARROW-13760: [C++] Lint


lidavidm Aug 27, 2021
9cb44e2

ARROW-13760: [C++] Remove debug flag


lidavidm Aug 30, 2021

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


18 changes: 15 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1371,13 +1371,25 @@ macro(build_protobuf)
 BUILD_COMMAND
 ${PROTOBUF_BUILD_COMMAND})
 else()
 # Strip lto flags (which may be added by dh_auto_configure)
 # See https://github.com/protocolbuffers/protobuf/issues/7092
 set(PROTOBUF_C_FLAGS ${EP_C_FLAGS})
 set(PROTOBUF_CXX_FLAGS ${EP_CXX_FLAGS})
 string(REPLACE "-flto=auto" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-flto=auto" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 set(PROTOBUF_CMAKE_ARGS
 ${EP_COMMON_CMAKE_ARGS}
 -DBUILD_SHARED_LIBS=OFF
 -DCMAKE_INSTALL_LIBDIR=lib
 "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
 -Dprotobuf_BUILD_TESTS=OFF
 -Dprotobuf_DEBUG_POSTFIX=)
 -Dprotobuf_DEBUG_POSTFIX=
 "-DCMAKE_C_FLAGS=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS=${PROTOBUF_CXX_FLAGS}"
 "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_CXX_FLAGS}")
 if(MSVC AND NOT ARROW_USE_STATIC_CRT)
 list(APPEND PROTOBUF_CMAKE_ARGS "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
 endif()
Expand DownExpand Up@@ -1420,8 +1432,8 @@ endmacro()

if(ARROW_WITH_PROTOBUF)
 if(ARROW_WITH_GRPC)
 # gRPC 1.21.0 or later require Protobuf 3.7.0 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.7.0")
 # FlightSQL uses proto3 optionals, which require 3.15 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0")
 elseif(ARROW_GANDIVA_JAVA)
 # google::protobuf::MessageLite::ByteSize() is deprecated since
 # Protobuf 3.4.0.
Expand Down

4 changes: 2 additions & 2 deletions
cpp/thirdparty/versions.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_ORC_BUILD_VERSION=1.6.9
ARROW_ORC_BUILD_SHA256_CHECKSUM=2b79f1152454a38abd7b361b407f65689e275f1fb28d4293892e42fbebcc0a9d
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.
Expand Down

3 changes: 3 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,7 @@ services:
 <<: *ccache
 ARROW_ENABLE_TIMING_TESTS: # inherit
 ARROW_MIMALLOC: "ON"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: &fedora-volumes
 - .:/arrow:delegated
 - ${DOCKER_VOLUME_PREFIX}fedora-ccache:/ccache:delegated
Expand DownExpand Up@@ -687,6 +688,7 @@ services:
 shm_size: *shm-size
 environment:
 <<: *ccache
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *fedora-volumes
 command: *python-command

Expand DownExpand Up@@ -1353,6 +1355,7 @@ services:
 <<: *ccache
 ARROW_CUDA: "ON"
 ARROW_GLIB_GTK_DOC: "true"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *ubuntu-volumes
 command: &docs-command >
 /bin/bash -c "
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-13760: [C++] Bump required Protobuf when using Flight#11006

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

lidavidm
wants to merge
8
commits into

from

 Closed


ARROW-13760: [C++] Bump required Protobuf when using Flight
#11006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
3373def

ARROW-13760: [C++] Bump required Protobuf when using Flight


lidavidm Aug 25, 2021
ee7ca51

ARROW-13760: [C++] Update comment


lidavidm Aug 25, 2021
8ed8f84

ARROW-13760: [C++] Bundle Protobuf where appropriate


lidavidm Aug 26, 2021
fc8aec2

ARROW-13760: [C++] Attempt to fix ubuntu-hirsute-amd64


lidavidm Aug 26, 2021
7fd4e19

ARROW-13760: [C++] Revert previous attempt


lidavidm Aug 27, 2021
c97ae11

ARROW-13760: [C++] Strip LTO flags from Protobuf build


lidavidm Aug 27, 2021
1933598

ARROW-13760: [C++] Lint


lidavidm Aug 27, 2021
9cb44e2

ARROW-13760: [C++] Remove debug flag


lidavidm Aug 30, 2021

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


18 changes: 15 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1371,13 +1371,25 @@ macro(build_protobuf)
 BUILD_COMMAND
 ${PROTOBUF_BUILD_COMMAND})
 else()
 # Strip lto flags (which may be added by dh_auto_configure)
 # See https://github.com/protocolbuffers/protobuf/issues/7092
 set(PROTOBUF_C_FLAGS ${EP_C_FLAGS})
 set(PROTOBUF_CXX_FLAGS ${EP_CXX_FLAGS})
 string(REPLACE "-flto=auto" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-flto=auto" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 set(PROTOBUF_CMAKE_ARGS
 ${EP_COMMON_CMAKE_ARGS}
 -DBUILD_SHARED_LIBS=OFF
 -DCMAKE_INSTALL_LIBDIR=lib
 "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
 -Dprotobuf_BUILD_TESTS=OFF
 -Dprotobuf_DEBUG_POSTFIX=)
 -Dprotobuf_DEBUG_POSTFIX=
 "-DCMAKE_C_FLAGS=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS=${PROTOBUF_CXX_FLAGS}"
 "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_CXX_FLAGS}")
 if(MSVC AND NOT ARROW_USE_STATIC_CRT)
 list(APPEND PROTOBUF_CMAKE_ARGS "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
 endif()
Expand DownExpand Up@@ -1420,8 +1432,8 @@ endmacro()

if(ARROW_WITH_PROTOBUF)
 if(ARROW_WITH_GRPC)
 # gRPC 1.21.0 or later require Protobuf 3.7.0 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.7.0")
 # FlightSQL uses proto3 optionals, which require 3.15 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0")
 elseif(ARROW_GANDIVA_JAVA)
 # google::protobuf::MessageLite::ByteSize() is deprecated since
 # Protobuf 3.4.0.
Expand Down

4 changes: 2 additions & 2 deletions
cpp/thirdparty/versions.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_ORC_BUILD_VERSION=1.6.9
ARROW_ORC_BUILD_SHA256_CHECKSUM=2b79f1152454a38abd7b361b407f65689e275f1fb28d4293892e42fbebcc0a9d
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.
Expand Down

3 changes: 3 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,7 @@ services:
 <<: *ccache
 ARROW_ENABLE_TIMING_TESTS: # inherit
 ARROW_MIMALLOC: "ON"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: &fedora-volumes
 - .:/arrow:delegated
 - ${DOCKER_VOLUME_PREFIX}fedora-ccache:/ccache:delegated
Expand DownExpand Up@@ -687,6 +688,7 @@ services:
 shm_size: *shm-size
 environment:
 <<: *ccache
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *fedora-volumes
 command: *python-command

Expand DownExpand Up@@ -1353,6 +1355,7 @@ services:
 <<: *ccache
 ARROW_CUDA: "ON"
 ARROW_GLIB_GTK_DOC: "true"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *ubuntu-volumes
 command: &docs-command >
 /bin/bash -c "
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-13760: [C++] Bump required Protobuf when using Flight#11006

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

lidavidm
wants to merge
8
commits into

from

 Closed


ARROW-13760: [C++] Bump required Protobuf when using Flight
#11006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
3373def

ARROW-13760: [C++] Bump required Protobuf when using Flight


lidavidm Aug 25, 2021
ee7ca51

ARROW-13760: [C++] Update comment


lidavidm Aug 25, 2021
8ed8f84

ARROW-13760: [C++] Bundle Protobuf where appropriate


lidavidm Aug 26, 2021
fc8aec2

ARROW-13760: [C++] Attempt to fix ubuntu-hirsute-amd64


lidavidm Aug 26, 2021
7fd4e19

ARROW-13760: [C++] Revert previous attempt


lidavidm Aug 27, 2021
c97ae11

ARROW-13760: [C++] Strip LTO flags from Protobuf build


lidavidm Aug 27, 2021
1933598

ARROW-13760: [C++] Lint


lidavidm Aug 27, 2021
9cb44e2

ARROW-13760: [C++] Remove debug flag


lidavidm Aug 30, 2021

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


18 changes: 15 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1371,13 +1371,25 @@ macro(build_protobuf)
 BUILD_COMMAND
 ${PROTOBUF_BUILD_COMMAND})
 else()
 # Strip lto flags (which may be added by dh_auto_configure)
 # See https://github.com/protocolbuffers/protobuf/issues/7092
 set(PROTOBUF_C_FLAGS ${EP_C_FLAGS})
 set(PROTOBUF_CXX_FLAGS ${EP_CXX_FLAGS})
 string(REPLACE "-flto=auto" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-flto=auto" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 set(PROTOBUF_CMAKE_ARGS
 ${EP_COMMON_CMAKE_ARGS}
 -DBUILD_SHARED_LIBS=OFF
 -DCMAKE_INSTALL_LIBDIR=lib
 "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
 -Dprotobuf_BUILD_TESTS=OFF
 -Dprotobuf_DEBUG_POSTFIX=)
 -Dprotobuf_DEBUG_POSTFIX=
 "-DCMAKE_C_FLAGS=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS=${PROTOBUF_CXX_FLAGS}"
 "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_CXX_FLAGS}")
 if(MSVC AND NOT ARROW_USE_STATIC_CRT)
 list(APPEND PROTOBUF_CMAKE_ARGS "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
 endif()
Expand DownExpand Up@@ -1420,8 +1432,8 @@ endmacro()

if(ARROW_WITH_PROTOBUF)
 if(ARROW_WITH_GRPC)
 # gRPC 1.21.0 or later require Protobuf 3.7.0 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.7.0")
 # FlightSQL uses proto3 optionals, which require 3.15 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0")
 elseif(ARROW_GANDIVA_JAVA)
 # google::protobuf::MessageLite::ByteSize() is deprecated since
 # Protobuf 3.4.0.
Expand Down

4 changes: 2 additions & 2 deletions
cpp/thirdparty/versions.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_ORC_BUILD_VERSION=1.6.9
ARROW_ORC_BUILD_SHA256_CHECKSUM=2b79f1152454a38abd7b361b407f65689e275f1fb28d4293892e42fbebcc0a9d
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.
Expand Down

3 changes: 3 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,7 @@ services:
 <<: *ccache
 ARROW_ENABLE_TIMING_TESTS: # inherit
 ARROW_MIMALLOC: "ON"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: &fedora-volumes
 - .:/arrow:delegated
 - ${DOCKER_VOLUME_PREFIX}fedora-ccache:/ccache:delegated
Expand DownExpand Up@@ -687,6 +688,7 @@ services:
 shm_size: *shm-size
 environment:
 <<: *ccache
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *fedora-volumes
 command: *python-command

Expand DownExpand Up@@ -1353,6 +1355,7 @@ services:
 <<: *ccache
 ARROW_CUDA: "ON"
 ARROW_GLIB_GTK_DOC: "true"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *ubuntu-volumes
 command: &docs-command >
 /bin/bash -c "
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-13760: [C++] Bump required Protobuf when using Flight#11006

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

lidavidm
wants to merge
8
commits into

from

 Closed


ARROW-13760: [C++] Bump required Protobuf when using Flight
#11006
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
3373def

ARROW-13760: [C++] Bump required Protobuf when using Flight


lidavidm Aug 25, 2021
ee7ca51

ARROW-13760: [C++] Update comment


lidavidm Aug 25, 2021
8ed8f84

ARROW-13760: [C++] Bundle Protobuf where appropriate


lidavidm Aug 26, 2021
fc8aec2

ARROW-13760: [C++] Attempt to fix ubuntu-hirsute-amd64


lidavidm Aug 26, 2021
7fd4e19

ARROW-13760: [C++] Revert previous attempt


lidavidm Aug 27, 2021
c97ae11

ARROW-13760: [C++] Strip LTO flags from Protobuf build


lidavidm Aug 27, 2021
1933598

ARROW-13760: [C++] Lint


lidavidm Aug 27, 2021
9cb44e2

ARROW-13760: [C++] Remove debug flag


lidavidm Aug 30, 2021

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


18 changes: 15 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1371,13 +1371,25 @@ macro(build_protobuf)
 BUILD_COMMAND
 ${PROTOBUF_BUILD_COMMAND})
 else()
 # Strip lto flags (which may be added by dh_auto_configure)
 # See https://github.com/protocolbuffers/protobuf/issues/7092
 set(PROTOBUF_C_FLAGS ${EP_C_FLAGS})
 set(PROTOBUF_CXX_FLAGS ${EP_CXX_FLAGS})
 string(REPLACE "-flto=auto" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_C_FLAGS "${PROTOBUF_C_FLAGS}")
 string(REPLACE "-flto=auto" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 string(REPLACE "-ffat-lto-objects" "" PROTOBUF_CXX_FLAGS "${PROTOBUF_CXX_FLAGS}")
 set(PROTOBUF_CMAKE_ARGS
 ${EP_COMMON_CMAKE_ARGS}
 -DBUILD_SHARED_LIBS=OFF
 -DCMAKE_INSTALL_LIBDIR=lib
 "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_PREFIX}"
 -Dprotobuf_BUILD_TESTS=OFF
 -Dprotobuf_DEBUG_POSTFIX=)
 -Dprotobuf_DEBUG_POSTFIX=
 "-DCMAKE_C_FLAGS=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS=${PROTOBUF_CXX_FLAGS}"
 "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_C_FLAGS}"
 "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${PROTOBUF_CXX_FLAGS}")
 if(MSVC AND NOT ARROW_USE_STATIC_CRT)
 list(APPEND PROTOBUF_CMAKE_ARGS "-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
 endif()
Expand DownExpand Up@@ -1420,8 +1432,8 @@ endmacro()

if(ARROW_WITH_PROTOBUF)
 if(ARROW_WITH_GRPC)
 # gRPC 1.21.0 or later require Protobuf 3.7.0 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.7.0")
 # FlightSQL uses proto3 optionals, which require 3.15 or later.
 set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0")
 elseif(ARROW_GANDIVA_JAVA)
 # google::protobuf::MessageLite::ByteSize() is deprecated since
 # Protobuf 3.4.0.
Expand Down

4 changes: 2 additions & 2 deletions
cpp/thirdparty/versions.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,8 +62,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_ORC_BUILD_VERSION=1.6.9
ARROW_ORC_BUILD_SHA256_CHECKSUM=2b79f1152454a38abd7b361b407f65689e275f1fb28d4293892e42fbebcc0a9d
ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
# a pre-release version of RapidJSON to build with GCC 8 without
# warnings.
Expand Down

3 changes: 3 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,7 @@ services:
 <<: *ccache
 ARROW_ENABLE_TIMING_TESTS: # inherit
 ARROW_MIMALLOC: "ON"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: &fedora-volumes
 - .:/arrow:delegated
 - ${DOCKER_VOLUME_PREFIX}fedora-ccache:/ccache:delegated
Expand DownExpand Up@@ -687,6 +688,7 @@ services:
 shm_size: *shm-size
 environment:
 <<: *ccache
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *fedora-volumes
 command: *python-command

Expand DownExpand Up@@ -1353,6 +1355,7 @@ services:
 <<: *ccache
 ARROW_CUDA: "ON"
 ARROW_GLIB_GTK_DOC: "true"
 Protobuf_SOURCE: "BUNDLED" # Need Protobuf >= 3.15
 volumes: *ubuntu-volumes
 command: &docs-command >
 /bin/bash -c "
Expand Down