Author: mreutegg
Date: Mon Jan 27 19:43:51 2014
New Revision: 1561807
URL: http://svn.apache.org/r1561807
Log:
OAK-1099: node creation noticeably slower with mongoMk compared to tarMk
- optimize access to properties with MongoNS
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoPropertyState.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/BlobReferenceIterator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoNodeState.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/BlobReferenceIterator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/BlobReferenceIterator.java?rev=1561807&r1=1561806&r2=1561807&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/BlobReferenceIterator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/BlobReferenceIterator.java
Mon Jan 27 19:43:51 2014
@@ -121,7 +121,7 @@ public class BlobReferenceIterator imple
JsopReader reader = new JsopTokenizer(v);
PropertyState p;
if (reader.matches('[')) {
- p = MongoNodeState.readArrayProperty("x", nodeStore, reader);
+ p = MongoPropertyState.readArrayProperty("x", nodeStore, reader);
if (p.getType() == Type.BINARIES) {
for (int i = 0; i < p.count(); i++) {
Blob b = p.getValue(Type.BINARY, i);
@@ -129,7 +129,7 @@ public class BlobReferenceIterator imple
}
}
} else {
- p = MongoNodeState.readProperty("x", nodeStore, reader);
+ p = MongoPropertyState.readProperty("x", nodeStore, reader);
if (p.getType() == Type.BINARY) {
Blob b = p.getValue(Type.BINARY);
batch.add(b);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoNodeState.java?rev=1561807&r1=1561806&r2=1561807&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoNodeState.java
Mon Jan 27 19:43:51 2014
@@ -18,30 +18,16 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collections;
import java.util.Iterator;
-import java.util.List;
import java.util.NoSuchElementException;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.jcr.PropertyType;
-import org.apache.jackrabbit.mk.json.JsopReader;
-import org.apache.jackrabbit.mk.json.JsopTokenizer;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.kernel.StringCache;
-import org.apache.jackrabbit.oak.kernel.TypeCodes;
-import org.apache.jackrabbit.oak.plugins.memory.BinaryPropertyState;
-import org.apache.jackrabbit.oak.plugins.memory.BooleanPropertyState;
-import org.apache.jackrabbit.oak.plugins.memory.DoublePropertyState;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
-import org.apache.jackrabbit.oak.plugins.memory.LongPropertyState;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder;
import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState;
-import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
-import org.apache.jackrabbit.oak.plugins.memory.StringPropertyState;
-import org.apache.jackrabbit.oak.plugins.value.Conversions;
import org.apache.jackrabbit.oak.spi.state.AbstractChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.AbstractNodeState;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
@@ -51,12 +37,9 @@ import org.apache.jackrabbit.oak.spi.sta
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Collections.emptyList;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
-import static
org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
/**
* A {@link NodeState} implementation for the {@link MongoNodeStore}.
@@ -141,12 +124,7 @@ final class MongoNodeState extends Abstr
if (value == null) {
return null;
}
- JsopReader reader = new JsopTokenizer(value);
- if (reader.matches('[')) {
- return readArrayProperty(name, reader);
- } else {
- return readProperty(name, reader);
- }
+ return new MongoPropertyState(store, name, value);
}
@Override
@@ -231,134 +209,6 @@ final class MongoNodeState extends Abstr
//------------------------------< internal
>--------------------------------
/**
- * FIXME: copied from KernelNodeState.
- *
- * Read a {@code PropertyState} from a {@link JsopReader}
- * @param name The name of the property state
- * @param reader The reader
- * @return new property state
- */
- PropertyState readProperty(String name, JsopReader reader) {
- return readProperty(name, store, reader);
- }
-
- /**
- * FIXME: copied from KernelNodeState.
- *
- * Read a {@code PropertyState} from a {@link JsopReader}.
- *
- * @param name the name of the property state
- * @param store the store
- * @param reader the reader
- * @return new property state
- */
- static PropertyState readProperty(String name, MongoNodeStore store,
JsopReader reader) {
- if (reader.matches(JsopReader.NUMBER)) {
- String number = reader.getToken();
- try {
- return new LongPropertyState(name, Long.parseLong(number));
- } catch (NumberFormatException e) {
- return new DoublePropertyState(name,
Double.parseDouble(number));
- }
- } else if (reader.matches(JsopReader.TRUE)) {
- return BooleanPropertyState.booleanProperty(name, true);
- } else if (reader.matches(JsopReader.FALSE)) {
- return BooleanPropertyState.booleanProperty(name, false);
- } else if (reader.matches(JsopReader.STRING)) {
- String jsonString = reader.getToken();
- if (jsonString.startsWith(TypeCodes.EMPTY_ARRAY)) {
- int type =
PropertyType.valueFromName(jsonString.substring(TypeCodes.EMPTY_ARRAY.length()));
- return PropertyStates.createProperty(name, emptyList(),
Type.fromTag(type, true));
- }
- int split = TypeCodes.split(jsonString);
- if (split != -1) {
- int type = TypeCodes.decodeType(split, jsonString);
- String value = TypeCodes.decodeName(split, jsonString);
- if (type == PropertyType.BINARY) {
- return BinaryPropertyState.binaryProperty(name,
store.getBlob(value));
- } else {
- return createProperty(name, StringCache.get(value), type);
- }
- } else {
- return StringPropertyState.stringProperty(name,
StringCache.get(jsonString));
- }
- } else {
- throw new IllegalArgumentException("Unexpected token: " +
reader.getToken());
- }
- }
-
- /**
- * FIXME: copied from KernelNodeState.
- *
- * Read a multi valued {@code PropertyState} from a {@link JsopReader}.
- *
- * @param name the name of the property state
- * @param reader the reader
- * @return new property state
- */
- PropertyState readArrayProperty(String name, JsopReader reader) {
- return readArrayProperty(name, store, reader);
- }
-
- /**
- * FIXME: copied from KernelNodeState.
- *
- * Read a multi valued {@code PropertyState} from a {@link JsopReader}.
- *
- * @param name the name of the property state
- * @param store the store
- * @param reader the reader
- * @return new property state
- */
- static PropertyState readArrayProperty(String name, MongoNodeStore store,
JsopReader reader) {
- int type = PropertyType.STRING;
- List<Object> values = Lists.newArrayList();
- while (!reader.matches(']')) {
- if (reader.matches(JsopReader.NUMBER)) {
- String number = reader.getToken();
- try {
- type = PropertyType.LONG;
- values.add(Long.parseLong(number));
- } catch (NumberFormatException e) {
- type = PropertyType.DOUBLE;
- values.add(Double.parseDouble(number));
- }
- } else if (reader.matches(JsopReader.TRUE)) {
- type = PropertyType.BOOLEAN;
- values.add(true);
- } else if (reader.matches(JsopReader.FALSE)) {
- type = PropertyType.BOOLEAN;
- values.add(false);
- } else if (reader.matches(JsopReader.STRING)) {
- String jsonString = reader.getToken();
- int split = TypeCodes.split(jsonString);
- if (split != -1) {
- type = TypeCodes.decodeType(split, jsonString);
- String value = TypeCodes.decodeName(split, jsonString);
- if (type == PropertyType.BINARY) {
- values.add(store.getBlob(value));
- } else if (type == PropertyType.DOUBLE) {
- values.add(Conversions.convert(value).toDouble());
- } else if (type == PropertyType.DECIMAL) {
- values.add(Conversions.convert(value).toDecimal());
- } else {
- values.add(StringCache.get(value));
- }
- } else {
- type = PropertyType.STRING;
- values.add(StringCache.get(jsonString));
- }
- } else {
- throw new IllegalArgumentException("Unexpected token: " +
reader.getToken());
- }
- reader.matches(',');
- }
- return createProperty(name, values, Type.fromTag(type, true));
- }
-
- //-----------------------< internal
>---------------------------------------
-
- /**
* Returns up to {@code limit} child node entries, starting after the given
* {@code name}.
*
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoPropertyState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoPropertyState.java?rev=1561807&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoPropertyState.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoPropertyState.java
Mon Jan 27 19:43:51 2014
@@ -0,0 +1,271 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.mongomk;
+
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.jcr.PropertyType;
+
+import org.apache.jackrabbit.mk.json.JsopReader;
+import org.apache.jackrabbit.mk.json.JsopTokenizer;
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.kernel.StringCache;
+import org.apache.jackrabbit.oak.kernel.TypeCodes;
+import org.apache.jackrabbit.oak.plugins.memory.AbstractPropertyState;
+import org.apache.jackrabbit.oak.plugins.memory.BinaryPropertyState;
+import org.apache.jackrabbit.oak.plugins.memory.BooleanPropertyState;
+import org.apache.jackrabbit.oak.plugins.memory.DoublePropertyState;
+import org.apache.jackrabbit.oak.plugins.memory.LongPropertyState;
+import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
+import org.apache.jackrabbit.oak.plugins.memory.StringPropertyState;
+import org.apache.jackrabbit.oak.plugins.value.Conversions;
+
+import com.google.common.collect.Lists;
+
+import static java.util.Collections.emptyList;
+import static
org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
+
+/**
+ * PropertyState implementation with lazy parsing of the JSOP encoded value.
+ */
+final class MongoPropertyState implements PropertyState {
+
+ private final MongoNodeStore store;
+
+ private final String name;
+
+ private final String value;
+
+ private PropertyState parsed = null;
+
+ MongoPropertyState(MongoNodeStore store, String name, String value) {
+ this.store = store;
+ this.name = name;
+ this.value = value;
+ }
+
+ @Nonnull
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean isArray() {
+ return parsed().isArray();
+ }
+
+ @Override
+ public Type<?> getType() {
+ return parsed().getType();
+ }
+
+ @Nonnull
+ @Override
+ public <T> T getValue(Type<T> type) {
+ return parsed().getValue(type);
+ }
+
+ @Nonnull
+ @Override
+ public <T> T getValue(Type<T> type, int index) {
+ return parsed().getValue(type, index);
+ }
+
+ @Override
+ public long size() {
+ return parsed().size();
+ }
+
+ @Override
+ public long size(int index) {
+ return parsed().size(index);
+ }
+
+ @Override
+ public int count() {
+ return parsed().count();
+ }
+
+ //------------------------------------------------------------< Object >--
+
+ @Override
+ public boolean equals(Object object) {
+ if (this == object) {
+ return true;
+ } else if (object instanceof MongoPropertyState) {
+ MongoPropertyState other = (MongoPropertyState) object;
+ return this.name.equals(other.name)
+ && this.value.equals(other.value);
+ }
+ // fall back to default equality check in AbstractPropertyState
+ return object instanceof PropertyState
+ && AbstractPropertyState.equal(parsed(), (PropertyState)
object);
+ }
+
+ @Override
+ public int hashCode() {
+ return AbstractPropertyState.hashCode(this);
+ }
+
+ @Override
+ public String toString() {
+ return AbstractPropertyState.toString(this);
+ }
+
+ //----------------------------< internal
>----------------------------------
+
+ private PropertyState parsed() {
+ if (parsed == null) {
+ JsopReader reader = new JsopTokenizer(value);
+ if (reader.matches('[')) {
+ parsed = readArrayProperty(name, reader);
+ } else {
+ parsed = readProperty(name, reader);
+ }
+ }
+ return parsed;
+ }
+
+ /**
+ * FIXME: copied from KernelNodeState.
+ *
+ * Read a {@code PropertyState} from a {@link JsopReader}
+ * @param name The name of the property state
+ * @param reader The reader
+ * @return new property state
+ */
+ PropertyState readProperty(String name, JsopReader reader) {
+ return readProperty(name, store, reader);
+ }
+
+ /**
+ * FIXME: copied from KernelNodeState.
+ *
+ * Read a {@code PropertyState} from a {@link JsopReader}.
+ *
+ * @param name the name of the property state
+ * @param store the store
+ * @param reader the reader
+ * @return new property state
+ */
+ static PropertyState readProperty(String name, MongoNodeStore store,
JsopReader reader) {
+ if (reader.matches(JsopReader.NUMBER)) {
+ String number = reader.getToken();
+ try {
+ return new LongPropertyState(name, Long.parseLong(number));
+ } catch (NumberFormatException e) {
+ return new DoublePropertyState(name,
Double.parseDouble(number));
+ }
+ } else if (reader.matches(JsopReader.TRUE)) {
+ return BooleanPropertyState.booleanProperty(name, true);
+ } else if (reader.matches(JsopReader.FALSE)) {
+ return BooleanPropertyState.booleanProperty(name, false);
+ } else if (reader.matches(JsopReader.STRING)) {
+ String jsonString = reader.getToken();
+ if (jsonString.startsWith(TypeCodes.EMPTY_ARRAY)) {
+ int type =
PropertyType.valueFromName(jsonString.substring(TypeCodes.EMPTY_ARRAY.length()));
+ return PropertyStates.createProperty(name, emptyList(),
Type.fromTag(type, true));
+ }
+ int split = TypeCodes.split(jsonString);
+ if (split != -1) {
+ int type = TypeCodes.decodeType(split, jsonString);
+ String value = TypeCodes.decodeName(split, jsonString);
+ if (type == PropertyType.BINARY) {
+ return BinaryPropertyState.binaryProperty(name,
store.getBlob(value));
+ } else {
+ return createProperty(name, StringCache.get(value), type);
+ }
+ } else {
+ return StringPropertyState.stringProperty(name,
StringCache.get(jsonString));
+ }
+ } else {
+ throw new IllegalArgumentException("Unexpected token: " +
reader.getToken());
+ }
+ }
+
+ /**
+ * FIXME: copied from KernelNodeState.
+ *
+ * Read a multi valued {@code PropertyState} from a {@link JsopReader}.
+ *
+ * @param name the name of the property state
+ * @param reader the reader
+ * @return new property state
+ */
+ PropertyState readArrayProperty(String name, JsopReader reader) {
+ return readArrayProperty(name, store, reader);
+ }
+
+ /**
+ * FIXME: copied from KernelNodeState.
+ *
+ * Read a multi valued {@code PropertyState} from a {@link JsopReader}.
+ *
+ * @param name the name of the property state
+ * @param store the store
+ * @param reader the reader
+ * @return new property state
+ */
+ static PropertyState readArrayProperty(String name, MongoNodeStore store,
JsopReader reader) {
+ int type = PropertyType.STRING;
+ List<Object> values = Lists.newArrayList();
+ while (!reader.matches(']')) {
+ if (reader.matches(JsopReader.NUMBER)) {
+ String number = reader.getToken();
+ try {
+ type = PropertyType.LONG;
+ values.add(Long.parseLong(number));
+ } catch (NumberFormatException e) {
+ type = PropertyType.DOUBLE;
+ values.add(Double.parseDouble(number));
+ }
+ } else if (reader.matches(JsopReader.TRUE)) {
+ type = PropertyType.BOOLEAN;
+ values.add(true);
+ } else if (reader.matches(JsopReader.FALSE)) {
+ type = PropertyType.BOOLEAN;
+ values.add(false);
+ } else if (reader.matches(JsopReader.STRING)) {
+ String jsonString = reader.getToken();
+ int split = TypeCodes.split(jsonString);
+ if (split != -1) {
+ type = TypeCodes.decodeType(split, jsonString);
+ String value = TypeCodes.decodeName(split, jsonString);
+ if (type == PropertyType.BINARY) {
+ values.add(store.getBlob(value));
+ } else if (type == PropertyType.DOUBLE) {
+ values.add(Conversions.convert(value).toDouble());
+ } else if (type == PropertyType.DECIMAL) {
+ values.add(Conversions.convert(value).toDecimal());
+ } else {
+ values.add(StringCache.get(value));
+ }
+ } else {
+ type = PropertyType.STRING;
+ values.add(StringCache.get(jsonString));
+ }
+ } else {
+ throw new IllegalArgumentException("Unexpected token: " +
reader.getToken());
+ }
+ reader.matches(',');
+ }
+ return createProperty(name, values, Type.fromTag(type, true));
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoPropertyState.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoPropertyState.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
