andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[RocksJava] Incoroporated changes for D29013

Browse Source
This commit is contained in:
fyrz 2014-11-16 18:23:06 +01:00
parent a280af2a57
commit 94f70a86b9
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/org/rocksdb/ColumnFamilyOptions.java
View File

@ -128,7 +128,10 @@ public class ColumnFamilyOptions extends RocksObject
@Override
public ColumnFamilyOptions setMergeOperatorName(String name) {
assert (isInitialized());
assert (name != null);
if (name == null) {
throw new IllegalArgumentException(
"Merge operator name must not be null.");
}
setMergeOperatorName(nativeHandle_, name);
return this;
}

5
java/org/rocksdb/Options.java
View File

@ -166,7 +166,10 @@ public class Options extends RocksObject
@Override
public Options setMergeOperatorName(String name) {
assert (isInitialized());
assert (name != null);
if (name == null) {
throw new IllegalArgumentException(
"Merge operator name must not be null.");
}
setMergeOperatorName(nativeHandle_, name);
return this;
}

4
java/org/rocksdb/test/MergeTest.java
View File

@ -273,7 +273,7 @@ public class MergeTest {
}
}
@Test(expected = AssertionError.class)
@Test(expected = IllegalArgumentException.class)
public void nullStringInSetMergeOperatorByNameOptions() {
Options opt = null;
try {
@ -286,7 +286,7 @@ public class MergeTest {
}
}
@Test(expected = AssertionError.class)
@Test(expected = IllegalArgumentException.class)
public void
nullStringInSetMergeOperatorByNameColumnFamilyOptions() {
ColumnFamilyOptions opt = null;