rename put to putString to make it easier for ides to find references

This commit is contained in:
2021-10-16 18:41:26 +02:00
parent d7cd4a94a5
commit 7d3ae61656
11 changed files with 52 additions and 52 deletions

View File

@@ -25,24 +25,24 @@ public class StringCompressor {
final UniqueStringIntegerPairs mapsi = new UniqueStringIntegerPairs(storageBasePath);
final StringCompressor result = new StringCompressor(mapsi);
result.put(ALL_DOCS_KEY);
result.put("");
result.putString(ALL_DOCS_KEY);
result.putString("");
TAG_ALL_DOCS = result.createTag(ALL_DOCS_KEY, "");
return result;
}
public int put(final String string) {
public int putString(final String string) {
return usip.computeIfAbsent(string, s -> usip.getHighestInteger() + 1);
}
public int put(final byte[] bytes, final int start, final int endExclusive,
public int putStringFromBytes(final byte[] bytes, final int start, final int endExclusive,
final Function<String, String> postProcess) {
return usip.computeIfAbsent(bytes, start, endExclusive, postProcess);
}
public int put(final String value, final Function<String, String> postProcess) {
public int putString(final String value, final Function<String, String> postProcess) {
final String processedValue = postProcess.apply(value);
return usip.computeIfAbsentWithPostprocess(processedValue, postProcess);
}
@@ -78,18 +78,18 @@ public class StringCompressor {
}
public Tags createAndAddToDictionary(final String key, final String value) {
final int keyAsInt = put(key);
final int valueAsInt = put(value);
final int keyAsInt = putString(key);
final int valueAsInt = putString(value);
return TagsBuilder.create().add(keyAsInt, valueAsInt).build();
}
public Tags createAndAddToDictionary(final String key1, final String value1, final String key2,
final String value2) {
final int key1AsInt = put(key1);
final int value1AsInt = put(value1);
final int key1AsInt = putString(key1);
final int value1AsInt = putString(value1);
final int key2AsInt = put(key2);
final int value2AsInt = put(value2);
final int key2AsInt = putString(key2);
final int value2AsInt = putString(value2);
final Tags result = TagsBuilder.create().add(key1AsInt, value1AsInt).add(key2AsInt, value2AsInt).build();
return result;
@@ -98,14 +98,14 @@ public class StringCompressor {
public Tags createAndAddToDictionary(final String key1, final String value1, final String key2, final String value2,
final String key3, final String value3) {
final int key1AsInt = put(key1);
final int value1AsInt = put(value1);
final int key1AsInt = putString(key1);
final int value1AsInt = putString(value1);
final int key2AsInt = put(key2);
final int value2AsInt = put(value2);
final int key2AsInt = putString(key2);
final int value2AsInt = putString(value2);
final int key3AsInt = put(key3);
final int value3AsInt = put(value3);
final int key3AsInt = putString(key3);
final int value3AsInt = putString(value3);
final Tags result = TagsBuilder.create().add(key1AsInt, value1AsInt).add(key2AsInt, value2AsInt)
.add(key3AsInt, value3AsInt).build();
@@ -115,17 +115,17 @@ public class StringCompressor {
public Tags createAndAddToDictionary(final String key1, final String value1, final String key2, final String value2,
final String key3, final String value3, final String key4, final String value4) {
final int key1AsInt = put(key1);
final int value1AsInt = put(value1);
final int key1AsInt = putString(key1);
final int value1AsInt = putString(value1);
final int key2AsInt = put(key2);
final int value2AsInt = put(value2);
final int key2AsInt = putString(key2);
final int value2AsInt = putString(value2);
final int key3AsInt = put(key3);
final int value3AsInt = put(value3);
final int key3AsInt = putString(key3);
final int value3AsInt = putString(value3);
final int key4AsInt = put(key4);
final int value4AsInt = put(value4);
final int key4AsInt = putString(key4);
final int value4AsInt = putString(value4);
final Tags result = TagsBuilder.create().add(key1AsInt, value1AsInt).add(key2AsInt, value2AsInt)
.add(key3AsInt, value3AsInt).add(key4AsInt, value4AsInt).build();

View File

@@ -128,7 +128,7 @@ public class Tags implements Comparable<Tags> {
}
public String getValue(final String key) {
final Tag needle = new Tag(STRING_COMPRESSOR.put(key), 0);
final Tag needle = new Tag(STRING_COMPRESSOR.putString(key), 0);
final int index = Collections.binarySearch(tags, needle, TagByKeyComparator.INSTANCE);
if (index >= 0) {
@@ -139,7 +139,7 @@ public class Tags implements Comparable<Tags> {
}
public int getValueAsInt(final String key) {
final Tag needle = new Tag(STRING_COMPRESSOR.put(key), 0);
final Tag needle = new Tag(STRING_COMPRESSOR.putString(key), 0);
final int index = Collections.binarySearch(tags, needle, TagByKeyComparator.INSTANCE);
if (index >= 0) {

View File

@@ -11,9 +11,9 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Assertions;
import org.lucares.utils.file.FileUtils;
public class StringCompressorTest {
@@ -34,7 +34,7 @@ public class StringCompressorTest {
final StringCompressor keyValueCompressor = StringCompressor.create(dataDirectory.resolve("key.csv"));
final String value = "foo";
final Integer intFoo = keyValueCompressor.put(value);
final Integer intFoo = keyValueCompressor.putString(value);
final String actual = keyValueCompressor.get(intFoo);
Assertions.assertEquals(value, actual);
@@ -47,7 +47,7 @@ public class StringCompressorTest {
{
final StringCompressor keyValueCompressor = StringCompressor.create(database);
keyValueCompressor.put(value);
keyValueCompressor.putString(value);
}
{
final StringCompressor keyValueCompressor = StringCompressor.create(database);

View File

@@ -21,7 +21,7 @@ final class StringInserter implements Callable<List<String>> {
final List<String> result = new ArrayList<>();
for (int i = 0; i < numEntries; i++) {
final String s = UUID.randomUUID().toString();
stringCompressor.put(s);
stringCompressor.putString(s);
result.add(s);
}
return result;