You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2020/01/29 17:58:42 UTC
[kudu] branch master updated (cbf02aa -> c80080d)
This is an automated email from the ASF dual-hosted git repository.
granthenke pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git.
from cbf02aa [thirdparty] update curl up to 7.68.0
new 0f3bb65 [cmake_modules] fix GET_LINKER_VERSION on macOS Catalina
new c80080d [java] Use Java built-in Base64 to generate randomString
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cmake_modules/KuduLinker.cmake | 3 ++-
.../kudu-client/src/main/java/org/apache/kudu/util/DataGenerator.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
[kudu] 02/02: [java] Use Java built-in Base64 to generate
randomString
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit c80080d365aa478a951cbbd76475a52a0767ac82
Author: Grant Henke <gr...@apache.org>
AuthorDate: Wed Jan 29 09:35:05 2020 -0600
[java] Use Java built-in Base64 to generate randomString
Currently we use DatatypeConverter to generate random Base64
Strings in DataGenerator.java. This patch changes to use the
Java built-in Base64 class instead.
Change-Id: I99d511bb8c161159b3ee477460246bc368cc2979
Reviewed-on: http://gerrit.cloudera.org:8080/15127
Tested-by: Grant Henke <gr...@apache.org>
Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
.../kudu-client/src/main/java/org/apache/kudu/util/DataGenerator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/util/DataGenerator.java b/java/kudu-client/src/main/java/org/apache/kudu/util/DataGenerator.java
index 095e3c9..0e281bc 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/util/DataGenerator.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/util/DataGenerator.java
@@ -19,9 +19,9 @@ package org.apache.kudu.util;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.Base64;
import java.util.List;
import java.util.Random;
-import javax.xml.bind.DatatypeConverter;
import com.google.common.base.Preconditions;
import org.apache.yetus.audience.InterfaceAudience;
@@ -148,7 +148,7 @@ public class DataGenerator {
public static String randomString(int length, Random random) {
byte[] bytes = new byte[length];
random.nextBytes(bytes);
- return DatatypeConverter.printBase64Binary(bytes);
+ return Base64.getEncoder().encodeToString(bytes);
}
/**
[kudu] 01/02: [cmake_modules] fix GET_LINKER_VERSION on macOS
Catalina
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 0f3bb6508d97227aba7dd6320c2b1f49ef7bd418
Author: Grant Henke <gr...@apache.org>
AuthorDate: Wed Jan 29 11:22:43 2020 -0600
[cmake_modules] fix GET_LINKER_VERSION on macOS Catalina
On macOS Catalina the linker version is currently `530`.
The current regex requires a second version component.
The result is an error that looks like the following:
CMake Error at cmake_modules/KuduLinker.cmake:160 (message):
Could not extract ld64 version. Linker version output:
Call Stack (most recent call first):
cmake_modules/KuduLinker.cmake:36 (GET_LINKER_VERSION)
CMakeLists.txt:398 (APPEND_LINKER_FLAGS)
To fix this the regex was updated to make the second version
component optional.
Change-Id: I11b43153279cc44766f5f03c7d59808d555d9321
Reviewed-on: http://gerrit.cloudera.org:8080/15129
Reviewed-by: Alexey Serbin <as...@cloudera.com>
Tested-by: Kudu Jenkins
---
cmake_modules/KuduLinker.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cmake_modules/KuduLinker.cmake b/cmake_modules/KuduLinker.cmake
index c447c73..d8dacfc 100644
--- a/cmake_modules/KuduLinker.cmake
+++ b/cmake_modules/KuduLinker.cmake
@@ -157,7 +157,8 @@ function(GET_LINKER_VERSION)
# ld64 outputs the versioning information into stderr.
# Sample:
# @(#)PROGRAM:ld PROJECT:ld64-409.12
- if (NOT "${LINKER_STDERR}" MATCHES "PROJECT:ld64-([0-9]+\\.[0-9]+)")
+ # @(#)PROGRAM:ld PROJECT:ld64-530
+ if (NOT "${LINKER_STDERR}" MATCHES "PROJECT:ld64-([0-9]+(\\.[0-9]+)?)")
message(SEND_ERROR "Could not extract ld64 version. "
"Linker version output: ${LINKER_STDOUT}")
endif()