This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new da80b674a2 Refactor error codes to allow future expansion (#4918)
da80b674a2 is described below
commit da80b674a219fc01ba202c35acdb6102c2a0e6eb
Author: Christopher L. Shannon <cshan...@apache.org>
AuthorDate: Mon Sep 23 11:03:05 2024 -0400
Refactor error codes to allow future expansion (#4918)
This change refactors the MetadataContraint error codes that are new in
version 3.1 to beging with 3100. This makes future expansion easier and
will allow keeping codes consistent across versions.
Issue #4915
---
.../server/constraints/MetadataConstraints.java | 12 +++----
.../constraints/MetadataConstraintsTest.java | 42 +++++++++++-----------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index b6d120f4b4..0e18fa0a01 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -133,7 +133,7 @@ public class MetadataConstraints implements Constraint {
try {
stfConsumer.accept(StoredTabletFile.of(metadata));
} catch (RuntimeException e) {
- addViolation(violations, 9);
+ addViolation(violations, 3100);
}
}
@@ -255,11 +255,11 @@ public class MetadataConstraints implements Constraint {
return "Lock not held in zookeeper by writer";
case 8:
return "Bulk load mutation contains either inconsistent files or
multiple fateTX ids";
- case 9:
+ case 3100:
return "Invalid data file metadata format";
- case 10:
+ case 3101:
return "Suspended timestamp is not valid";
- case 17:
+ case 3102:
return "Invalid directory column value";
}
return null;
@@ -361,7 +361,7 @@ public class MetadataConstraints implements Constraint {
try {
ServerColumnFamily.validateDirCol(new
String(columnUpdate.getValue(), UTF_8));
} catch (IllegalArgumentException e) {
- addViolation(violations, 17);
+ addViolation(violations, 3102);
}
// splits, which also write the time reference, are allowed to write
this reference
@@ -384,7 +384,7 @@ public class MetadataConstraints implements Constraint {
try {
SuspendingTServer.fromValue(new Value(columnUpdate.getValue()));
} catch (IllegalArgumentException e) {
- addViolation(violations, 10);
+ addViolation(violations, 3101);
}
}
}
diff --git
a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
index 096b3647e6..5251f6148d 100644
---
a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
@@ -161,7 +161,7 @@ public class MetadataConstraintsTest {
violations = mc.check(createEnv(), m);
assertFalse(violations.isEmpty());
assertEquals(1, violations.size());
- assertEquals(Short.valueOf((short) 10), violations.get(0));
+ assertEquals(Short.valueOf((short) 3101), violations.get(0));
}
@Test
@@ -282,7 +282,7 @@ public class MetadataConstraintsTest {
.getMetadata()
.replace("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile",
"/someFile")),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Missing tables directory in path
m = new Mutation(new Text("0;foo"));
@@ -291,7 +291,7 @@ public class MetadataConstraintsTest {
.getMetadata().replace("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile",
"hdfs://1.2.3.4/accumulo/2a/t-0003/someFile")),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// No DataFileColumnFamily included
m = new Mutation(new Text("0;foo"));
@@ -305,7 +305,7 @@ public class MetadataConstraintsTest {
m = new Mutation(new Text("0;foo"));
m.put(BulkFileColumnFamily.NAME, new
Text("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile"),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test startRow key is missing so validation should fail
// {"path":"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile","endRow":""}
@@ -314,7 +314,7 @@ public class MetadataConstraintsTest {
new Text(
"{\"path\":\"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile\",\"endRow\":\"\"}"),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test path key replaced with empty string so validation
should fail
//
{"":"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile","startRow":"","endRow":""}
@@ -323,7 +323,7 @@ public class MetadataConstraintsTest {
BulkFileColumnFamily.NAME, new Text(StoredTabletFile
.serialize("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile").replace("path",
"")),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test path value missing
// {"path":"","startRow":"","endRow":""}
@@ -332,7 +332,7 @@ public class MetadataConstraintsTest {
new Text(StoredTabletFile.of(new
Path("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile"))
.getMetadata().replaceFirst("\"path\":\".*\",\"startRow",
"\"path\":\"\",\"startRow")),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test startRow key replaced with empty string so validation
should fail
//
{"path":"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile","":"","endRow":""}
@@ -340,7 +340,7 @@ public class MetadataConstraintsTest {
m.put(BulkFileColumnFamily.NAME, new Text(StoredTabletFile
.serialize("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile").replace("startRow",
"")),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test endRow key missing so validation should fail
m = new Mutation(new Text("0;foo"));
@@ -348,7 +348,7 @@ public class MetadataConstraintsTest {
BulkFileColumnFamily.NAME, new Text(StoredTabletFile
.serialize("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile").replace("endRow",
"")),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - endRow will be replaced with encoded row without the
exclusive byte 0x00 which is
// required for an endRow so will fail validation
@@ -358,7 +358,7 @@ public class MetadataConstraintsTest {
new Range("a", false, "b",
true)).getMetadata().replaceFirst("\"endRow\":\".*\"",
"\"endRow\":\"" + encodeRowForMetadata("bad") + "\"")),
new Value("5"));
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
}
@@ -384,12 +384,12 @@ public class MetadataConstraintsTest {
.getMetadata()
.replace("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile",
"/someFile")),
value);
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - only path (old format) so should fail parsing
m = new Mutation(new Text("0;foo"));
m.put(columnFamily, new
Text("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile"), value);
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test path key replaced with empty string so validation
should fail
//
{"":"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile","startRow":"","endRow":""}
@@ -398,7 +398,7 @@ public class MetadataConstraintsTest {
columnFamily, new Text(StoredTabletFile
.serialize("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile").replace("path",
"")),
value);
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test path value missing
// {"path":"","startRow":"","endRow":""}
@@ -407,7 +407,7 @@ public class MetadataConstraintsTest {
new Text(StoredTabletFile.of(new
Path("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile"))
.getMetadata().replaceFirst("\"path\":\".*\",\"startRow",
"\"path\":\"\",\"startRow")),
value);
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test startRow key replaced with empty string so validation
should fail
//
{"path":"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile","":"","endRow":""}
@@ -415,7 +415,7 @@ public class MetadataConstraintsTest {
m.put(columnFamily, new Text(StoredTabletFile
.serialize("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile").replace("startRow",
"")),
value);
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test startRow key is missing so validation should fail
// {"path":"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile","endRow":""}
@@ -424,7 +424,7 @@ public class MetadataConstraintsTest {
new Text(
"{\"path\":\"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile\",\"endRow\":\"\"}"),
value);
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - test endRow key replaced with empty string so validation
should fail
//
{"path":"hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile","":"","endRow":""}
@@ -433,7 +433,7 @@ public class MetadataConstraintsTest {
columnFamily, new Text(StoredTabletFile
.serialize("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile").replace("endRow",
"")),
value);
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Bad Json - endRow will be replaced with encoded row without the
exclusive byte 0x00 which is
// required for an endRow so this will fail validation
@@ -443,7 +443,7 @@ public class MetadataConstraintsTest {
new Range("a", false, "b", true)).getMetadata()
.replaceFirst("\"endRow\":\".*\"", "\"endRow\":\"" +
encodeRowForMetadata("b") + "\"")),
value);
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Missing tables directory in path
m = new Mutation(new Text("0;foo"));
@@ -452,7 +452,7 @@ public class MetadataConstraintsTest {
.getMetadata().replace("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/someFile",
"hdfs://1.2.3.4/accumulo/2a/t-0003/someFile")),
new DataFileValue(1, 1).encodeAsValue());
- assertViolation(mc, m, (short) 9);
+ assertViolation(mc, m, (short) 3100);
// Should pass validation (inf range)
m = new Mutation(new Text("0;foo"));
@@ -472,7 +472,7 @@ public class MetadataConstraintsTest {
violations = mc.check(createEnv(), m);
assertTrue(violations.isEmpty());
- assertNotNull(mc.getViolationDescription((short) 9));
+ assertNotNull(mc.getViolationDescription((short) 3100));
}
@Test
@@ -490,7 +490,7 @@ public class MetadataConstraintsTest {
violations = mc.check(createEnv(), m);
assertFalse(violations.isEmpty());
assertEquals(1, violations.size());
- assertEquals((short) 17, violations.get(0));
+ assertEquals((short) 3102, violations.get(0));
}
