Skip to content

removes mutable list constant from DefaultKeySizeConstraint #6163

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

Merged
keith-turner merged 5 commits into from
Mar 4, 2026
+8 −6
Merged

removes mutable list constant from DefaultKeySizeConstraint #6163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23b2394
removes mutable list constant from DefaultKeySizeConstraint
keith-turner Mar 2, 2026
4af2bd5
fix test
keith-turner Mar 2, 2026
2d13ad2
empty commit
keith-turner Mar 3, 2026
b3e5f50
fix test
keith-turner Mar 3, 2026
03b01fd
fix another test
keith-turner Mar 3, 2026
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: 1 addition & 3 deletions core/src/main/java/org/apache/accumulo/core/data/constraints/DefaultKeySizeConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ public String getViolationDescription(short violationCode) {
return null;
}

static final List<Short> NO_VIOLATIONS = new ArrayList<>();

@Override
public List<Short> check(Environment env, Mutation mutation) {

// fast size check
if (mutation.numBytes() < maxSize) {
return NO_VIOLATIONS;
return null;
Copy link
Member

@ctubbsii ctubbsii Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior, which I think we should probably try to avoid, unless... is null documented as a special case?

Alternatively, could replace this with an unmodifiable or immutable list.

Copy link
Contributor Author

@keith-turner keith-turner Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the javadoc for the super class says to return null when there are no violations.

accumulo/core/src/main/java/org/apache/accumulo/core/data/constraints/Constraint.java

Lines 90 to 91 in d49e7cd

* Checks a mutation for constraint violations. If the mutation contains no violations, returns
* null. Otherwise, returns a list of violation codes.

}

List<Short> violations = new ArrayList<>();
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/apache/accumulo/core/constraints/DefaultKeySizeConstraintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.accumulo.core.constraints;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

import java.util.Collections;

Expand All @@ -41,7 +42,7 @@ public void testConstraint() {
// pass constraints
Mutation m = new Mutation("rowId");
m.put("colf", "colq", new Value());
assertEquals(Collections.emptyList(), constraint.check(null, m));
assertNull(constraint.check(null, m));

// test with row id > 1mb
m = new Mutation(oversized);
Expand Down
4 changes: 3 additions & 1 deletion core/src/test/java/org/apache/accumulo/core/constraints/DeprecatedConstraintExtendTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

Expand Down Expand Up @@ -92,10 +93,11 @@ private static class MinKeySizeConstraint extends DefaultKeySizeConstraint {
@Override
public List<Short> check(Constraint.Environment env, Mutation mutation) {
List<Short> violations = super.check(env, mutation);
if (!violations.isEmpty()) {
if (violations != null && !violations.isEmpty()) {
return violations;
}

violations = new ArrayList<>();
for (ColumnUpdate cu : mutation.getUpdates()) {
int size = mutation.getRow().length;
size += cu.getColumnFamily().length;
Expand Down
3 changes: 2 additions & 1 deletion ...src/test/java/org/apache/accumulo/core/data/constraints/DefaultKeySizeConstraintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.accumulo.core.data.constraints;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

import java.util.Collections;

Expand All @@ -39,7 +40,7 @@ public void testConstraint() {
// pass constraints
Mutation m = new Mutation("rowId");
m.put("colf", "colq", new Value());
assertEquals(Collections.emptyList(), constraint.check(null, m));
assertNull(constraint.check(null, m));

// test with row id > 1mb
m = new Mutation(oversized);
Expand Down