fixed #31

orientechnologies · Dec 9, 2014 · 6046d69 · 6046d69
1 parent 36fea87
commit 6046d69
Show file tree

Hide file tree

Showing 6 changed files with 194 additions and 250 deletions.
diff --git a/src/main/java/com/orientechnologies/lucene/LuceneTxOperations.java b/src/main/java/com/orientechnologies/lucene/LuceneTxOperations.java
@@ -0,0 +1,33 @@
+/*
+ *
+ *  * Copyright 2014 Orient Technologies.
+ *  *
+ *  * Licensed 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 com.orientechnologies.lucene;
+
+import com.orientechnologies.orient.core.db.record.OIdentifiable;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Created by Enrico Risa on 09/12/14.
+ */
+public class LuceneTxOperations {
+
+  public final Set<OIdentifiable> removed = new HashSet<OIdentifiable>();
+  public final Set<OIdentifiable> added   = new HashSet<OIdentifiable>();
+}
diff --git a/src/main/java/com/orientechnologies/lucene/index/OLuceneFullTextIndex.java b/src/main/java/com/orientechnologies/lucene/index/OLuceneFullTextIndex.java
@@ -16,192 +16,16 @@
 
 package com.orientechnologies.lucene.index;
 
-import com.orientechnologies.common.listener.OProgressListener;
 import com.orientechnologies.lucene.OLuceneIndex;
 import com.orientechnologies.lucene.OLuceneIndexEngine;
-import com.orientechnologies.orient.core.command.OCommandContext;
-import com.orientechnologies.orient.core.config.OGlobalConfiguration;
-import com.orientechnologies.orient.core.db.record.OIdentifiable;
-import com.orientechnologies.orient.core.db.record.ridbag.sbtree.OIndexRIDContainer;
-import com.orientechnologies.orient.core.index.ODefaultIndexFactory;
-import com.orientechnologies.orient.core.index.OIndexDefinition;
-import com.orientechnologies.orient.core.index.OIndexMultiValues;
 import com.orientechnologies.orient.core.record.impl.ODocument;
-import com.orientechnologies.orient.core.type.tree.OMVRBTreeRIDSet;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class OLuceneFullTextIndex extends OIndexMultiValues implements OLuceneIndex {
+public class OLuceneFullTextIndex extends OLuceneIndexNotUnique implements OLuceneIndex {
 
   public OLuceneFullTextIndex(String typeId, String algorithm, OLuceneIndexEngine indexEngine, String valueContainerAlgorithm,
       ODocument metadata) {
     super(typeId, algorithm, indexEngine, valueContainerAlgorithm, metadata);
     indexEngine.setIndexMetadata(metadata);
   }
 
-  @Override
-  public OIndexMultiValues create(String name, OIndexDefinition indexDefinition, String clusterIndexName,
-      Set<String> clustersToIndex, boolean rebuild, OProgressListener progressListener) {
-    OLuceneIndexEngine engine = (OLuceneIndexEngine) indexEngine;
-    engine.setManagedIndex(this);
-    return super.create(name, indexDefinition, clusterIndexName, clustersToIndex, rebuild, progressListener);
-  }
-
-  @Override
-  public OIndexMultiValues put(Object key, OIdentifiable iSingleValue) {
-    if (key == null)
-      return this;
-
-    key = getCollatingValue(key);
-
-    modificationLock.requestModificationLock();
-
-    try {
-      acquireExclusiveLock();
-
-      try {
-        Set<OIdentifiable> refs = new HashSet<OIdentifiable>();
-
-        // ADD THE CURRENT DOCUMENT AS REF FOR THAT WORD
-        refs.add(iSingleValue);
-
-        // SAVE THE INDEX ENTRY
-        indexEngine.put(key, refs);
-
-      } finally {
-        releaseExclusiveLock();
-      }
-      return this;
-    } finally {
-      modificationLock.releaseModificationLock();
-    }
-  }
-
-  public Set<OIdentifiable> get(Object key, OCommandContext context) {
-    checkForRebuild();
-
-    key = getCollatingValue(key);
-
-    acquireSharedLock();
-    try {
-
-      final Set<OIdentifiable> values = indexEngine.get(key);
-
-      if (values == null)
-        return Collections.emptySet();
-
-      return values;
-
-    } finally {
-      releaseSharedLock();
-    }
-  }
-
-  @Override
-  public Set<OIdentifiable> get(Object key) {
-    checkForRebuild();
-
-    acquireSharedLock();
-    try {
-
-      final Set<OIdentifiable> values = indexEngine.get(key);
-
-      if (values == null)
-        return Collections.emptySet();
-
-      return values;
-
-    } finally {
-      releaseSharedLock();
-    }
-  }
-
-  @Override
-  public boolean remove(Object key, OIdentifiable value) {
-
-    key = getCollatingValue(key);
-
-    modificationLock.requestModificationLock();
-
-    try {
-
-      acquireExclusiveLock();
-      try {
-
-        if (indexEngine instanceof OLuceneIndexEngine) {
-          return ((OLuceneIndexEngine) indexEngine).remove(key, value);
-        }
-      } finally {
-        releaseExclusiveLock();
-      }
-
-    } finally {
-      modificationLock.releaseModificationLock();
-    }
-    return false;
-  }
-
-  @Override
-  public boolean supportsOrderedIterations() {
-    return false;
-  }
-
-  @Override
-  public boolean canBeUsedInEqualityOperators() {
-    return false;
-  }
-
-  @Override
-  protected void putInSnapshot(Object key, OIdentifiable value, Map<Object, Object> snapshot) {
-    key = getCollatingValue(key);
-
-    Object snapshotValue = snapshot.get(key);
-
-    Set<OIdentifiable> values;
-    if (snapshotValue == null)
-      values = null;
-    else if (snapshotValue.equals(RemovedValue.INSTANCE))
-      values = null;
-    else
-      values = (Set<OIdentifiable>) snapshotValue;
-
-    if (values == null) {
-      if (ODefaultIndexFactory.SBTREEBONSAI_VALUE_CONTAINER.equals(valueContainerAlgorithm)) {
-        values = new OIndexRIDContainer(getName(), true);
-      } else {
-        values = new OMVRBTreeRIDSet(OGlobalConfiguration.MVRBTREE_RID_BINARY_THRESHOLD.getValueAsInteger());
-        ((OMVRBTreeRIDSet) values).setAutoConvertToRecord(false);
-      }
-
-      snapshot.put(key, values);
-    }
-
-    values.add(value.getIdentity());
-    snapshot.put(key, values);
-  }
-
-    @Override
-    protected void removeFromSnapshot(Object key, OIdentifiable value, Map<Object, Object> snapshot) {
-        super.removeFromSnapshot(key, value, snapshot);
-    }
-
-    @Override
-  public long rebuild(OProgressListener iProgressListener) {
-
-    long size = 0;
-    OLuceneIndexEngine engine = (OLuceneIndexEngine) indexEngine;
-    try {
-      engine.setRebuilding(true);
-      super.rebuild(iProgressListener);
-    } finally {
-      engine.setRebuilding(false);
-
-    }
-    engine.flush();
-    return ((OLuceneIndexEngine) indexEngine).size(null);
-
-  }
 }
diff --git a/src/main/java/com/orientechnologies/lucene/index/OLuceneIndexNotUnique.java b/src/main/java/com/orientechnologies/lucene/index/OLuceneIndexNotUnique.java
@@ -16,29 +16,27 @@
 
 package com.orientechnologies.lucene.index;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 import com.orientechnologies.common.listener.OProgressListener;
+import com.orientechnologies.lucene.LuceneTxOperations;
 import com.orientechnologies.lucene.OLuceneIndex;
 import com.orientechnologies.lucene.OLuceneIndexEngine;
-import com.orientechnologies.orient.core.config.OGlobalConfiguration;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
-import com.orientechnologies.orient.core.db.record.ridbag.sbtree.OIndexRIDContainer;
-import com.orientechnologies.orient.core.index.ODefaultIndexFactory;
 import com.orientechnologies.orient.core.index.OIndexDefinition;
 import com.orientechnologies.orient.core.index.OIndexMultiValues;
 import com.orientechnologies.orient.core.index.OIndexNotUnique;
-import com.orientechnologies.orient.core.record.ORecord;
 import com.orientechnologies.orient.core.record.impl.ODocument;
-import com.orientechnologies.orient.core.type.tree.OMVRBTreeRIDSet;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 public class OLuceneIndexNotUnique extends OIndexNotUnique implements OLuceneIndex {
 
   public OLuceneIndexNotUnique(String typeId, String algorithm, OLuceneIndexEngine engine, String valueContainerAlgorithm,
       ODocument metadata) {
     super(typeId, algorithm, engine, valueContainerAlgorithm, metadata);
+    engine.setIndexMetadata(metadata);
   }
 
   @Override
@@ -73,6 +71,22 @@ public OIndexMultiValues put(Object key, OIdentifiable iSingleValue) {
     }
   }
 
+  @Override
+  protected void commitSnapshot(Map<Object, Object> snapshot) {
+    for (Map.Entry<Object, Object> snapshotEntry : snapshot.entrySet()) {
+      Object key = snapshotEntry.getKey();
+      LuceneTxOperations operations = (LuceneTxOperations) snapshotEntry.getValue();
+      checkForKeyType(key);
+
+      for (OIdentifiable oIdentifiable : operations.removed) {
+        ((OLuceneIndexEngine) indexEngine).remove(key, oIdentifiable);
+      }
+      indexEngine.put(key, operations.added);
+
+    }
+
+  }
+
   @Override
   public Set<OIdentifiable> get(Object key) {
     checkForRebuild();
@@ -94,6 +108,33 @@ public Set<OIdentifiable> get(Object key) {
     }
   }
 
+  @Override
+  protected void removeFromSnapshot(Object key, OIdentifiable value, Map<Object, Object> snapshot) {
+    key = getCollatingValue(key);
+
+    LuceneTxOperations operations = (LuceneTxOperations) snapshot.get(key);
+    if (operations == null) {
+      operations = new LuceneTxOperations();
+      snapshot.put(key, operations);
+    }
+    operations.removed.add(value.getIdentity());
+    snapshot.put(key, operations);
+  }
+
+  @Override
+  protected void putInSnapshot(Object key, OIdentifiable value, Map<Object, Object> snapshot) {
+    key = getCollatingValue(key);
+
+    LuceneTxOperations operations = (LuceneTxOperations) snapshot.get(key);
+
+    if (operations == null) {
+      operations = new LuceneTxOperations();
+      snapshot.put(key, operations);
+    }
+    operations.added.add(value.getIdentity());
+    snapshot.put(key, operations);
+  }
+
   @Override
   public boolean remove(Object key, OIdentifiable value) {
     checkForRebuild();
@@ -121,16 +162,21 @@ public boolean remove(Object key, OIdentifiable value) {
   @Override
   public long rebuild(OProgressListener iProgressListener) {
 
-    long size = 0;
     OLuceneIndexEngine engine = (OLuceneIndexEngine) indexEngine;
     try {
       engine.setRebuilding(true);
       super.rebuild(iProgressListener);
     } finally {
       engine.setRebuilding(false);
+
     }
+    engine.flush();
+    return ((OLuceneIndexEngine) indexEngine).size(null);
 
-    return size;
+  }
 
+  @Override
+  protected Object getCollatingValue(Object key) {
+    return key;
   }
 }