This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new e12fcbefb6 Refactor Root Tablet serialization code (#2718)
e12fcbefb6 is described below
commit e12fcbefb6f2979c3aeabd5597f3799c107df1ba
Author: Mike Miller
AuthorDate: Fri May 27 11:26:59 2022 +
Refactor Root Tablet serialization code (#2718)
* Remove static state from RootTabletMetadata and RootGcCandidates
* Replaced static from() methods in RootTabletMetadata and RootGcCandidates
with constructors
* Added comment to AccumuloDataVersion javadoc
* Store entries natively in the simpler string-based multi-map, rather
than converting to key/value pairs and back again. Only convert to
key/value pairs when needed.
* Get rid of `new GsonBuilder().create()`. Even Gson's own javadoc
recommends `new Gson()` if all you want is the defaults.
Co-authored-by: Christopher Tubbs
---
.../core/clientImpl/bulk/BulkSerialize.java| 3 +-
.../schema/ExternalCompactionFinalState.java | 3 +-
.../schema/ExternalCompactionMetadata.java | 3 +-
.../core/metadata/schema/RootTabletMetadata.java | 224 +
.../core/metadata/schema/TabletMetadata.java | 2 +-
.../core/metadata/schema/TabletsMetadata.java | 9 +-
.../accumulo/server/AccumuloDataVersion.java | 2 +-
.../accumulo/server/init/ZooKeeperInitializer.java | 32 ++-
.../accumulo/server/metadata/RootGcCandidates.java | 106 +-
.../server/metadata/RootTabletMutatorImpl.java | 2 +-
.../accumulo/server/metadata/ServerAmpleImpl.java | 17 +-
.../manager/state/RootTabletStateStoreTest.java| 11 +-
.../accumulo/test/CountNameNodeOpsBulkIT.java | 3 +-
13 files changed, 198 insertions(+), 219 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkSerialize.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkSerialize.java
index 82fb70bc1b..f20efaa9ef 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkSerialize.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkSerialize.java
@@ -130,8 +130,7 @@ public class BulkSerialize {
final Path renamingFile = new Path(bulkDir, Constants.BULK_RENAME_FILE);
try (OutputStream fsOut = output.create(renamingFile);
BufferedWriter writer = new BufferedWriter(new
OutputStreamWriter(fsOut))) {
- Gson gson = new GsonBuilder().create();
- gson.toJson(oldToNewNameMap, writer);
+ new Gson().toJson(oldToNewNameMap, writer);
}
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionFinalState.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionFinalState.java
index 4a01d246a9..6e2aaa15ed 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionFinalState.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionFinalState.java
@@ -27,11 +27,10 @@ import org.apache.hadoop.io.Text;
import com.google.common.base.Preconditions;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
public class ExternalCompactionFinalState {
- private static final Gson GSON = new GsonBuilder().create();
+ private static final Gson GSON = new Gson();
public enum FinalState {
FINISHED, FAILED
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionMetadata.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionMetadata.java
index b4a11c8084..fcd6bf2c3f 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionMetadata.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionMetadata.java
@@ -33,11 +33,10 @@ import
org.apache.accumulo.core.util.compaction.CompactionExecutorIdImpl;
import org.apache.hadoop.fs.Path;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
public class ExternalCompactionMetadata {
- private static final Gson GSON = new GsonBuilder().create();
+ private static final Gson GSON = new Gson();
private final Set jobFiles;
private final Set nextFiles;
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/RootTabletMetadata.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/RootTabletMetadata.java
index c62b13145d..bbd85b6305 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/RootTabletMetadata.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/RootTabletMetadata.java
@@ -18,183 +18,153 @@
*/
package org.apache.accumulo.core.metadata.schema;
+import static
