Skip to content

Commit d6b268d

Browse files
alanpaxtonrhubner
authored andcommitted
fix format manually
do what CI says `make format` should have done, rather than what `make format` does for me…
1 parent 341f36f commit d6b268d

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

java/src/test/java/org/rocksdb/BlobOptionsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ public void testBlobWriteAboveThresholdCF() throws RocksDBException {
302302

303303
final ColumnFamilyOptions columnFamilyOptions2 =
304304
new ColumnFamilyOptions().setMinBlobSize(minBlobSize).setEnableBlobFiles(false);
305-
final ColumnFamilyDescriptor columnFamilyDescriptor1 =
306-
new ColumnFamilyDescriptor("column_family_1".getBytes(UTF_8), columnFamilyOptions1);
305+
final ColumnFamilyDescriptor columnFamilyDescriptor1 = new ColumnFamilyDescriptor(
306+
"column_family_1".getBytes(UTF_8), columnFamilyOptions1);
307307
final ColumnFamilyDescriptor columnFamilyDescriptor2 = new ColumnFamilyDescriptor(
308308
"column_family_2".getBytes(UTF_8), columnFamilyOptions2)) {
309309
assertThat(columnFamilyOptions1.enableBlobFiles()).isEqualTo(true);

java/src/test/java/org/rocksdb/MultiGetManyKeysTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ public void multiGetAsListLargeTransactionalCF() throws RocksDBException {
104104
final List<byte[]> keys = generateRandomKeys(numKeys);
105105
final Map<Key, byte[]> keyValues = generateRandomKeyValues(keys, 10);
106106

107-
try (
108-
final ColumnFamilyDescriptor columnFamilyDescriptor =
109-
new ColumnFamilyDescriptor("cfTest".getBytes());
110-
final ColumnFamilyDescriptor defaultCf = new ColumnFamilyDescriptor("default".getBytes())) {
107+
try (final ColumnFamilyDescriptor columnFamilyDescriptor =
108+
new ColumnFamilyDescriptor("cfTest".getBytes());
109+
final ColumnFamilyDescriptor defaultCf =
110+
new ColumnFamilyDescriptor("default".getBytes())) {
111111
putKeysAndValues(columnFamilyDescriptor, keyValues);
112112

113113
final List<ColumnFamilyDescriptor> columnFamilyDescriptors = new ArrayList<>();
@@ -143,10 +143,10 @@ public void multiGetAsListLargeTransactionalCF() throws RocksDBException {
143143
public void multiGetForUpdateAsListLargeTransactionalCF() throws RocksDBException {
144144
final List<byte[]> keys = generateRandomKeys(numKeys);
145145
final Map<Key, byte[]> keyValues = generateRandomKeyValues(keys, 10);
146-
try (
147-
final ColumnFamilyDescriptor columnFamilyDescriptor =
148-
new ColumnFamilyDescriptor("cfTest".getBytes());
149-
final ColumnFamilyDescriptor defaultCf = new ColumnFamilyDescriptor("default".getBytes())) {
146+
try (final ColumnFamilyDescriptor columnFamilyDescriptor =
147+
new ColumnFamilyDescriptor("cfTest".getBytes());
148+
final ColumnFamilyDescriptor defaultCf =
149+
new ColumnFamilyDescriptor("default".getBytes())) {
150150
putKeysAndValues(columnFamilyDescriptor, keyValues);
151151

152152
final List<ColumnFamilyDescriptor> columnFamilyDescriptors = new ArrayList<>();

java/src/test/java/org/rocksdb/PutMultiplePartsTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,11 @@ private void validateResults() throws RocksDBException {
129129

130130
private void validateResultsCF() throws RocksDBException {
131131
final List<ColumnFamilyHandle> columnFamilyHandles = new ArrayList<>();
132-
try (final ColumnFamilyDescriptor testCF = new ColumnFamilyDescriptor("cfTest".getBytes());
133-
final ColumnFamilyDescriptor defaultCF = new ColumnFamilyDescriptor("default".getBytes());
134-
final RocksDB db = RocksDB.open(new DBOptions(), dbFolder.getRoot().getAbsolutePath(),
135-
Arrays.asList(testCF, defaultCF), columnFamilyHandles)) {
132+
try (
133+
final ColumnFamilyDescriptor testCF = new ColumnFamilyDescriptor("cfTest".getBytes());
134+
final ColumnFamilyDescriptor defaultCF = new ColumnFamilyDescriptor("default".getBytes());
135+
final RocksDB db = RocksDB.open(new DBOptions(), dbFolder.getRoot().getAbsolutePath(),
136+
Arrays.asList(testCF, defaultCF), columnFamilyHandles)) {
136137
final List<byte[]> keys = generateItemsAsList("key", ":", numParts);
137138
final byte[][] values = generateItems("value", "", numParts);
138139

java/src/test/java/org/rocksdb/SecondaryDBTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public void openAsSecondaryColumnFamilies() throws RocksDBException {
6565
try (final ColumnFamilyOptions cfOpts = new ColumnFamilyOptions();
6666
final ColumnFamilyDescriptor defaultCF =
6767
new ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY, cfOpts);
68-
final ColumnFamilyDescriptor cfd1 = new ColumnFamilyDescriptor("cf1".getBytes(), cfOpts)) {
68+
final ColumnFamilyDescriptor cfd1 =
69+
new ColumnFamilyDescriptor("cf1".getBytes(), cfOpts)) {
6970
final List<ColumnFamilyDescriptor> cfDescriptors = new ArrayList<>();
7071
cfDescriptors.add(defaultCF);
7172
cfDescriptors.add(cfd1);

0 commit comments

Comments
 (0)