Skip to content

Commit

Permalink
OAK-11371: Remove usage of Guava UnsignedBytes.compare() (#1976)
Browse files Browse the repository at this point in the history
  • Loading branch information
@reschke
reschke authored Jan 10, 2025
1 parent d2cb1e2 commit d70630c
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 23 deletions.
6 changes: 3 additions & 3 deletions ...ugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.io.Closeable;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
Expand Down Expand Up @@ -59,7 +60,6 @@
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.guava.common.io.Closeables;
import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFutureTask;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.LineIterator;
Expand Down Expand Up @@ -514,7 +514,7 @@ protected long sweep(GarbageCollectorFileState fs, long markStart, boolean force
long deletedSize = 0;
int numDeletedSizeAvailable = 0;
try {
removesWriter = Files.newWriter(fs.getGarbage(), StandardCharsets.UTF_8);
removesWriter = new BufferedWriter(new FileWriter(fs.getGarbage(), StandardCharsets.UTF_8));
ArrayDeque<String> removesQueue = new ArrayDeque<String>();
iterator =
FileUtils.lineIterator(fs.getGcCandidates(), StandardCharsets.UTF_8.name());
Expand Down Expand Up @@ -622,7 +622,7 @@ static void saveBatchToFile(List<String> ids, BufferedWriter writer) throws IOEx
* @param logPath whether to log path in the file or not
*/
protected void iterateNodeTree(GarbageCollectorFileState fs, final boolean logPath) throws IOException {
final BufferedWriter writer = Files.newWriter(fs.getMarkedRefs(), StandardCharsets.UTF_8);
final BufferedWriter writer = new BufferedWriter(new FileWriter(fs.getMarkedRefs(), StandardCharsets.UTF_8));
final AtomicInteger count = new AtomicInteger();
try {
marker.collectReferences(
Expand Down
4 changes: 2 additions & 2 deletions ...plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.io.BufferedWriter;
import java.io.Closeable;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -49,7 +50,6 @@

import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.guava.common.io.Files.move;
import static org.apache.jackrabbit.guava.common.io.Files.newWriter;
import static java.io.File.createTempFile;
import static java.lang.System.currentTimeMillis;
import static java.util.Collections.emptyIterator;
Expand Down Expand Up @@ -673,7 +673,7 @@ private synchronized void nextGeneration() throws IOException {
close();

processFile = new File(rootDir, prefix + IN_PROCESS.getFileNameSuffix());
writer = newWriter(processFile, StandardCharsets.UTF_8);
writer = new BufferedWriter(new FileWriter(processFile, StandardCharsets.UTF_8));
LOG.info("Created new process file and writer over {} ", processFile.getAbsolutePath());
}

Expand Down
3 changes: 2 additions & 1 deletion ...-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -719,7 +720,7 @@ private void createUpgradeLoad(File home, File pendingUploadFile) throws IOExcep
private void createGibberishLoad(File home, File pendingUploadFile) throws IOException {
BufferedWriter writer = null;
try {
writer = Files.newWriter(pendingUploadFile, StandardCharsets.UTF_8);
writer = new BufferedWriter(new FileWriter(pendingUploadFile, StandardCharsets.UTF_8));
FileIOUtils.writeAsLine(writer, "jerhgiuheirghoeoorqehgsjlwjpfkkwpkf", false);
} finally {
Closeables.close(writer, true);
Expand Down
4 changes: 2 additions & 2 deletions oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import static org.apache.jackrabbit.guava.common.io.FileWriteMode.APPEND;
import static org.apache.jackrabbit.guava.common.io.Files.asByteSink;
import static org.apache.jackrabbit.guava.common.io.Files.move;
import static org.apache.jackrabbit.guava.common.io.Files.newWriter;
import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
import static org.apache.jackrabbit.oak.commons.sort.ExternalSort.mergeSortedFiles;
Expand All @@ -35,6 +34,7 @@
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
Expand Down Expand Up @@ -232,7 +232,7 @@ public static int writeStrings(Iterator<String> iterator, File f, boolean escape
*/
public static int writeStrings(Iterator<String> iterator, File f, boolean escape,
@NotNull Function<String, String> transformer, @Nullable Logger logger, @Nullable String message) throws IOException {
BufferedWriter writer = newWriter(f, UTF_8);
BufferedWriter writer = new BufferedWriter(new FileWriter(f, UTF_8));
boolean threw = true;

int count = 0;
Expand Down
3 changes: 2 additions & 1 deletion oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
Expand Down Expand Up @@ -488,7 +489,7 @@ public void customType() throws Exception {

String testData = String.join("\n", transform(testLines, tl -> tl.line));
File testFile = folder.newFile();
try (BufferedWriter bufferedWriter = Files.newWriter(testFile, charset)) {
try (BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(testFile, charset))) {
bufferedWriter.write(testData);
}

Expand Down
3 changes: 2 additions & 1 deletion .../src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.BufferedWriter;
import java.io.Closeable;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.lang.ref.SoftReference;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -242,7 +243,7 @@ private void writeToFile(String fileName, Set<String> blobIds) throws IOExceptio
return;
}
File file = new File(directory, fileName);
BufferedWriter bw = Files.newWriter(file, StandardCharsets.UTF_8);
BufferedWriter bw = new BufferedWriter(new FileWriter(file, StandardCharsets.UTF_8));
for (String id : blobIds) {
bw.write(id);
bw.newLine();
Expand Down
4 changes: 2 additions & 2 deletions ...ache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Expand All @@ -38,7 +39,6 @@
import java.util.concurrent.atomic.AtomicBoolean;

import org.apache.jackrabbit.guava.common.io.Closeables;
import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.LineIterator;
import org.apache.commons.io.filefilter.IOFileFilter;
Expand Down Expand Up @@ -217,7 +217,7 @@ public void purgeBlobsDeleted(long before, @NotNull GarbageCollectableBlobStore
if (blobIdsTracked) {
try {
idTempDeleteFile = File.createTempFile("idTempDelete", null, rootDirectory);
idTempDeleteWriter = Files.newWriter(idTempDeleteFile, StandardCharsets.UTF_8);
idTempDeleteWriter = new BufferedWriter(new FileWriter(idTempDeleteFile, StandardCharsets.UTF_8));
} catch (Exception e) {
LOG.warn("Unable to open a writer to a temp file, will ignore tracker sync");
blobIdsTracked = false;
Expand Down
5 changes: 3 additions & 2 deletions oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.jackrabbit.oak.exporter;

import java.io.BufferedWriter;
import java.io.Closeable;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
Expand Down Expand Up @@ -75,7 +76,7 @@ public void serialize(File dir) throws IOException {
Validate.checkState(dir.mkdirs(), "Cannot create directory [%s]", dir.getAbsolutePath());
}
File file = new File(dir, getFileName());
try (Writer writer = Files.newWriter(file, StandardCharsets.UTF_8)){
try (Writer writer = new BufferedWriter(new FileWriter(file, StandardCharsets.UTF_8))) {
serialize(writer, createBlobSerializer(dir));
}
closeSerializer();
Expand Down
8 changes: 4 additions & 4 deletions oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

package org.apache.jackrabbit.oak.plugins.tika;

import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;

import org.apache.jackrabbit.guava.common.collect.FluentIterable;
import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -42,8 +42,8 @@ public CSVFileGenerator(File outFile) {
public void generate(FluentIterable<BinaryResource> binaries) throws IOException {
Closer closer = Closer.create();
int count = 0;
try{
CSVPrinter printer = new CSVPrinter(Files.newWriter(outFile, StandardCharsets.UTF_8),
try {
CSVPrinter printer = new CSVPrinter(new BufferedWriter(new FileWriter(outFile, StandardCharsets.UTF_8)),
CSVFileBinaryResourceProvider.FORMAT);
closer.register(printer);
for (BinaryResource br : binaries){
Expand Down
6 changes: 3 additions & 3 deletions oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.BufferedWriter;
import java.io.Closeable;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
Expand All @@ -48,7 +49,6 @@
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.io.Closeables;
import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.guava.common.io.Files;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientURI;
import com.mongodb.MongoURI;
Expand Down Expand Up @@ -426,7 +426,7 @@ public String apply(@Nullable String input) {

private static void retrieveBlobReferences(GarbageCollectableBlobStore blobStore, BlobReferenceRetriever marker,
File marked, String dsType, boolean isVerbose) throws IOException {
final BufferedWriter writer = Files.newWriter(marked, StandardCharsets.UTF_8);
final BufferedWriter writer = new BufferedWriter(new FileWriter(marked, StandardCharsets.UTF_8));
final AtomicInteger count = new AtomicInteger();
boolean threw = true;
try {
Expand Down Expand Up @@ -549,7 +549,7 @@ public void traverse(String ... paths) throws IOException {
Stopwatch watch = createStarted();

try {
writer = Files.newWriter(references, StandardCharsets.UTF_8);
writer = new BufferedWriter(new FileWriter(references, StandardCharsets.UTF_8));
if (paths.length == 0) {
traverseChildren(nodeStore.getRoot(), "/", writer, count);
} else {
Expand Down
4 changes: 2 additions & 2 deletions oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.nio.charset.StandardCharsets;
Expand All @@ -42,7 +43,6 @@
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.io.Closeables;
import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.guava.common.io.Files;
import joptsimple.OptionParser;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.LineIterator;
Expand Down Expand Up @@ -197,7 +197,7 @@ private void execute(NodeStoreFixture fixture, DataStoreOptions dataStoreOpts, O
if (dataStoreOpts.dumpRefs()) {
log.info("Initiating dump of data store references");
final File referencesTemp = File.createTempFile("traverseref", null, new File(opts.getTempDirectory()));
final BufferedWriter writer = Files.newWriter(referencesTemp, StandardCharsets.UTF_8);
final BufferedWriter writer = new BufferedWriter(new FileWriter(referencesTemp, StandardCharsets.UTF_8));

boolean threw = true;
try {
Expand Down

0 comments on commit d70630c

Please sign in to comment.