提交 3b8fb1b7 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Fix building of documentation

上级 a50f8f5c
...@@ -841,16 +841,16 @@ public class MVMap<K, V> extends AbstractMap<K, V> ...@@ -841,16 +841,16 @@ public class MVMap<K, V> extends AbstractMap<K, V>
/** /**
* Use the new root page from now on. * Use the new root page from now on.
* @param expectedRootRefrence expected current root reference * @param expectedRootReference expected current root reference
* @param newRootPage the new root page * @param newRootPage the new root page
* @param attemptUpdateCounter how many attempt (including current) * @param attemptUpdateCounter how many attempt (including current)
* were made to update root * were made to update root
* @return new RootReference or null if update failed * @return new RootReference or null if update failed
*/ */
protected final boolean updateRoot(RootReference expectedRootRefrence, Page newRootPage, protected final boolean updateRoot(RootReference expectedRootReference, Page newRootPage, int attemptUpdateCounter)
int attemptUpdateCounter) { {
RootReference currentRoot = flushAndGetRoot(); RootReference currentRoot = flushAndGetRoot();
return currentRoot == expectedRootRefrence && return currentRoot == expectedRootReference &&
!currentRoot.lockedForUpdate && !currentRoot.lockedForUpdate &&
root.compareAndSet(currentRoot, root.compareAndSet(currentRoot,
new RootReference(currentRoot, newRootPage, attemptUpdateCounter)); new RootReference(currentRoot, newRootPage, attemptUpdateCounter));
......
...@@ -506,7 +506,8 @@ public class MVStore implements AutoCloseable { ...@@ -506,7 +506,8 @@ public class MVStore implements AutoCloseable {
if (id >= 0) { if (id >= 0) {
map = openMap(id, builder); map = openMap(id, builder);
assert builder.getKeyType() == null || map.getKeyType().getClass().equals(builder.getKeyType().getClass()); assert builder.getKeyType() == null || map.getKeyType().getClass().equals(builder.getKeyType().getClass());
assert builder.getValueType() == null || map.getValueType().getClass().equals(builder.getValueType().getClass()); assert builder.getValueType() == null || map.getValueType().getClass().equals(builder.getValueType()
.getClass());
} else { } else {
HashMap<String, Object> c = new HashMap<>(); HashMap<String, Object> c = new HashMap<>();
id = lastMapId.incrementAndGet(); id = lastMapId.incrementAndGet();
......
...@@ -806,4 +806,4 @@ econd irst bcef ordinality nord unnest ...@@ -806,4 +806,4 @@ econd irst bcef ordinality nord unnest
analyst occupation distributive josaph aor engineer sajeewa isuru randil kevin doctor businessman artist ashan analyst occupation distributive josaph aor engineer sajeewa isuru randil kevin doctor businessman artist ashan
corrupts splitted disruption unintentional octets preconditions predicates subq objectweb insn opcodes corrupts splitted disruption unintentional octets preconditions predicates subq objectweb insn opcodes
preserves masking holder unboxing avert iae transformed subtle reevaluate exclusions subclause ftbl rgr preserves masking holder unboxing avert iae transformed subtle reevaluate exclusions subclause ftbl rgr
presorted inclusion contexts aax presorted inclusion contexts aax mwd percentile interpolate mwa
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论