svn commit: r1556205 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk: MongoDocumentStore.java RevisionEntry.java

[mr...@apache.org]

Author: mreutegg
Date: Tue Jan  7 13:07:39 2014
New Revision: 1556205

URL: http://svn.apache.org/r1556205
Log:
OAK-1306: Reduce memory usage on MongoMK commit

Added:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/RevisionEntry.java   (with props)
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoDocumentStore.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoDocumentStore.java?rev=1556205&r1=1556204&r2=1556205&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoDocumentStore.java Tue Jan  7 13:07:39 2014
@@ -428,8 +428,7 @@ public class MongoDocumentStore implemen
                             throw new IllegalStateException(
                                     "SET_MAP_ENTRY must not have null revision");
                         }
-                        DBObject value = new BasicDBObject(
-                                k.getRevision().toString(), op.value);
+                        DBObject value = new RevisionEntry(r, op.value);
                         inserts[i].put(k.getName(), value);
                         break;
                     }

Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/RevisionEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/RevisionEntry.java?rev=1556205&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/RevisionEntry.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/RevisionEntry.java Tue Jan  7 13:07:39 2014
@@ -0,0 +1,106 @@
+/*
+ * 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.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+
+import org.bson.BSONObject;
+
+import com.mongodb.DBObject;
+import com.mongodb.util.JSON;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * A light-weight implementation of a MongoDB DBObject for a single revision
+ * based map entry.
+ */
+public class RevisionEntry implements DBObject {
+
+    private final Revision revision;
+
+    private final Object value;
+
+    public RevisionEntry(@Nonnull Revision revision,
+                         @Nonnull Object value) {
+        this.revision = checkNotNull(revision);
+        this.value = checkNotNull(value);
+    }
+
+    @Override
+    public void markAsPartialObject() {
+    }
+
+    @Override
+    public boolean isPartialObject() {
+        return false;
+    }
+
+    @Override
+    public Object put(String key, Object v) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void putAll(BSONObject o) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void putAll(Map m) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object get(String key) {
+        return revision.toString().equals(key) ? value : null;
+    }
+
+    @Override
+    public Map toMap() {
+        return Collections.singletonMap(revision.toString(), value);
+    }
+
+    @Override
+    public Object removeField(String key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean containsKey(String s) {
+        return containsField(s);
+    }
+
+    @Override
+    public boolean containsField(String s) {
+        return revision.toString().equals(s);
+    }
+
+    @Override
+    public Set<String> keySet() {
+        return Collections.singleton(revision.toString());
+    }
+
+    @Override
+    public String toString() {
+        return JSON.serialize(this);
+    }
+}

Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/RevisionEntry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/RevisionEntry.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL