You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2025/02/04 18:03:31 UTC
(accumulo) branch 3.1 updated (55c0d4ccee -> 355ef24bc5)
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 55c0d4ccee Improvements to ExternalCompactionsIT (#5297)
new 08e58c02aa use new accumulo-access APIs (#5300)
new 355ef24bc5 restores old column visibilty flatten code
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:
.../client/summary/summarizers/AuthorizationSummarizer.java | 10 +++++-----
.../org/apache/accumulo/core/security/ColumnVisibility.java | 5 ++++-
2 files changed, 9 insertions(+), 6 deletions(-)
(accumulo) 02/02: restores old column visibilty flatten code
Posted by kt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 355ef24bc512ab893f8f6bf33f8d3f4052f9ee10
Author: Keith Turner <kt...@apache.org>
AuthorDate: Tue Feb 4 18:01:43 2025 +0000
restores old column visibilty flatten code
accumulo-access removed its normalize functionality that was built in
and ColumnVisibility was using this. Restored the old code for
flattening expression in ColumnVisibility to get things back in working
order.
---
.../java/org/apache/accumulo/core/security/ColumnVisibility.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index bc49baca5f..8d5c558d38 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -297,7 +297,10 @@ public class ColumnVisibility {
*/
@Deprecated(since = "3.1.0")
public byte[] flatten() {
- return AccessExpression.of(expression, true).getExpression().getBytes(UTF_8);
+ Node normRoot = normalize(nodeSupplier.get(), expression);
+ StringBuilder builder = new StringBuilder(expression.length);
+ stringify(normRoot, expression, builder);
+ return builder.toString().getBytes(UTF_8);
}
@Deprecated
(accumulo) 01/02: use new accumulo-access APIs (#5300)
Posted by kt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 08e58c02aae0bcd56943fbcedb9c0e21d0eb50d9
Author: Keith Turner <kt...@apache.org>
AuthorDate: Tue Feb 4 10:52:01 2025 -0500
use new accumulo-access APIs (#5300)
---
.../client/summary/summarizers/AuthorizationSummarizer.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java b/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java
index a0045ba592..ff60606a78 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/summary/summarizers/AuthorizationSummarizer.java
@@ -81,11 +81,11 @@ public class AuthorizationSummarizer extends CountingSummarizer<ByteSequence> {
if (vis.length() > 0) {
Set<ByteSequence> auths = cache.get(vis);
if (auths == null) {
- auths = new HashSet<>();
- for (String auth : AccessExpression.of(vis.toArray()).getAuthorizations().asSet()) {
- auths.add(new ArrayByteSequence(auth));
- }
- cache.put(new ArrayByteSequence(vis), auths);
+ var newAuths = new HashSet<ByteSequence>();
+ AccessExpression.findAuthorizations(vis.toArray(),
+ auth -> newAuths.add(new ArrayByteSequence(auth)));
+ cache.put(new ArrayByteSequence(vis), newAuths);
+ auths = newAuths;
}
for (ByteSequence auth : auths) {