ready for 2.1-rc4

orientechnologies · Jun 17, 2015 · 77e2c4f · 77e2c4f
1 parent a8af602
commit 77e2c4f
Show file tree

Hide file tree

Showing 11 changed files with 228 additions and 213 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,12 +22,12 @@
 
     <groupId>com.orientechnologies</groupId>
     <artifactId>orientdb-lucene</artifactId>
-    <version>2.0.7</version>
+    <version>2.1-SNAPSHOT</version>
     <properties>
         <surefire.version>2.17</surefire.version>
         <javac.src.version>1.6</javac.src.version>
         <javac.target.version>1.6</javac.target.version>
-        <orientdb.version>2.1-rc2</orientdb.version>
+        <orientdb.version>2.1-SNAPSHOT</orientdb.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <packaging>jar</packaging>

diff --git a/src/main/java/com/orientechnologies/lucene/OLuceneIndexEngine.java b/src/main/java/com/orientechnologies/lucene/OLuceneIndexEngine.java
@@ -54,10 +54,10 @@ public void flush() {
   }
 
   @Override
-  public void create(String indexName, OIndexDefinition indexDefinition, String clusterIndexName,
-      OStreamSerializer valueSerializer, boolean isAutomatic) {
+  public void create(OIndexDefinition indexDefinition, String clusterIndexName, OStreamSerializer valueSerializer,
+      boolean isAutomatic) {
 
-    lucene.createIndex(indexName, indexDefinition, clusterIndexName, valueSerializer, isAutomatic, indexMetadata);
+    lucene.createIndex(indexDefinition, clusterIndexName, valueSerializer, isAutomatic, indexMetadata);
 
   }
 
@@ -182,7 +182,7 @@ public boolean hasRangeQuerySupport() {
 
   @Override
   public int getVersion() {
-    return 0;
+    return 1;
   }
 
   public void setManagedIndex(OIndex index) {
@@ -204,4 +204,8 @@ public void setRebuilding(boolean rebuilding) {
   public IndexSearcher searcher() throws IOException {
     return lucene.getSearcher();
   }
+
+  public void setIndexName(String indexName) {
+    lucene.setIndexName(indexName);
+  }
 }
diff --git a/src/main/java/com/orientechnologies/lucene/OLuceneIndexFactory.java b/src/main/java/com/orientechnologies/lucene/OLuceneIndexFactory.java
@@ -71,18 +71,23 @@ public Set<String> getAlgorithms() {
   }
 
   @Override
-  public OIndexInternal<?> createIndex(ODatabaseDocumentInternal oDatabaseRecord, String indexType, String algorithm,
-      String valueContainerAlgorithm, ODocument metadata) throws OConfigurationException {
-    return createLuceneIndex(oDatabaseRecord, indexType, valueContainerAlgorithm, metadata);
+  public OIndexInternal<?> createIndex(String name, ODatabaseDocumentInternal database, String indexType, String algorithm,
+      String valueContainerAlgorithm, ODocument metadata, int version) throws OConfigurationException {
+    return createIndex(name, database, indexType, algorithm, valueContainerAlgorithm, metadata);
   }
 
-  private OIndexInternal<?> createLuceneIndex(ODatabaseDocumentInternal oDatabaseRecord, String indexType,
+  protected OIndexInternal<?> createIndex(String name, ODatabaseDocumentInternal oDatabaseRecord, String indexType,
+      String algorithm, String valueContainerAlgorithm, ODocument metadata) throws OConfigurationException {
+    return createLuceneIndex(name, oDatabaseRecord, indexType, valueContainerAlgorithm, metadata);
+  }
+
+  private OIndexInternal<?> createLuceneIndex(String name, ODatabaseDocumentInternal oDatabaseRecord, String indexType,
       String valueContainerAlgorithm, ODocument metadata) {
     if (OClass.INDEX_TYPE.FULLTEXT.toString().equals(indexType)) {
-      return new OLuceneFullTextIndex(indexType, LUCENE_ALGORITHM, new OLuceneIndexEngine<Set<OIdentifiable>>(
+      return new OLuceneFullTextIndex(name, indexType, LUCENE_ALGORITHM, new OLuceneIndexEngine<Set<OIdentifiable>>(
           new OLuceneFullTextIndexManager(), indexType), valueContainerAlgorithm, metadata);
     } else if (OClass.INDEX_TYPE.SPATIAL.toString().equals(indexType)) {
-      return new OLuceneSpatialIndex(indexType, LUCENE_ALGORITHM, new OLuceneIndexEngine<Set<OIdentifiable>>(
+      return new OLuceneSpatialIndex(name, indexType, LUCENE_ALGORITHM, new OLuceneIndexEngine<Set<OIdentifiable>>(
           new OLuceneSpatialIndexManager(new OShapeFactoryImpl()), indexType), valueContainerAlgorithm, metadata);
     }
     throw new OConfigurationException("Unsupported type : " + indexType);

diff --git a/src/main/java/com/orientechnologies/lucene/OLuceneIndexType.java b/src/main/java/com/orientechnologies/lucene/OLuceneIndexType.java
@@ -128,6 +128,7 @@ public static Query createFullQuery(OIndexDefinition index, Object key, Analyzer
                 }
             } else {
                 query = params.toString();
+
             }
         } else {
             query = key.toString();
@@ -147,6 +148,7 @@ protected static Query getQueryParser(OIndexDefinition index, String key, Analyz
             queryParser = new MultiFieldQueryParser(version, index.getFields().toArray(new String[index.getFields().size()]), analyzer);
         }
 
+
         return queryParser.parse(key);
     }
 

diff --git a/src/main/java/com/orientechnologies/lucene/index/OLuceneFullTextIndex.java b/src/main/java/com/orientechnologies/lucene/index/OLuceneFullTextIndex.java
@@ -22,9 +22,9 @@
 
 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);
+  public OLuceneFullTextIndex(String name, String typeId, String algorithm, OLuceneIndexEngine indexEngine,
+      String valueContainerAlgorithm, ODocument metadata) {
+    super(name, typeId, algorithm, indexEngine, valueContainerAlgorithm, metadata);
     indexEngine.setIndexMetadata(metadata);
   }
 

diff --git a/src/main/java/com/orientechnologies/lucene/index/OLuceneIndexNotUnique.java b/src/main/java/com/orientechnologies/lucene/index/OLuceneIndexNotUnique.java
@@ -35,9 +35,10 @@
 
 public class OLuceneIndexNotUnique extends OIndexNotUnique implements OLuceneIndex {
 
-  public OLuceneIndexNotUnique(String typeId, String algorithm, OLuceneIndexEngine engine, String valueContainerAlgorithm,
+  public OLuceneIndexNotUnique(String name,String typeId, String algorithm, OLuceneIndexEngine engine, String valueContainerAlgorithm,
       ODocument metadata) {
     super(typeId, algorithm, engine, valueContainerAlgorithm, metadata);
+
     engine.setIndexMetadata(metadata);
   }
 
@@ -46,6 +47,7 @@ public OIndexMultiValues create(String name, OIndexDefinition indexDefinition, S
       Set<String> clustersToIndex, boolean rebuild, OProgressListener progressListener) {
     OLuceneIndexEngine engine = (OLuceneIndexEngine) indexEngine;
     engine.setManagedIndex(this);
+    engine.setIndexName(name);
     return super.create(name, indexDefinition, clusterIndexName, clustersToIndex, rebuild, progressListener);
   }
 
@@ -191,7 +193,7 @@ public long rebuild(OProgressListener iProgressListener) {
   }
 
   @Override
-  protected Object getCollatingValue(Object key) {
+  public Object getCollatingValue(Object key) {
     return key;
   }
 

diff --git a/src/main/java/com/orientechnologies/lucene/index/OLuceneSpatialIndex.java b/src/main/java/com/orientechnologies/lucene/index/OLuceneSpatialIndex.java
@@ -21,11 +21,9 @@
 
 public class OLuceneSpatialIndex extends OLuceneIndexNotUnique {
 
-  public OLuceneSpatialIndex(String typeId, String algorithm, OLuceneIndexEngine engine, String valueContainerAlgorithm,
-      ODocument metadata) {
-    super(typeId, algorithm, engine, valueContainerAlgorithm, metadata);
+  public OLuceneSpatialIndex(String name, String typeId, String algorithm, OLuceneIndexEngine engine,
+      String valueContainerAlgorithm, ODocument metadata) {
+    super(name, typeId, algorithm, engine, valueContainerAlgorithm, metadata);
   }
 
-
-
 }
diff --git a/src/main/java/com/orientechnologies/lucene/manager/OLuceneIndexManagerAbstract.java b/src/main/java/com/orientechnologies/lucene/manager/OLuceneIndexManagerAbstract.java
@@ -84,12 +84,12 @@ public OLuceneIndexManagerAbstract() {
   }
 
   @Override
-  public void create(String indexName, OIndexDefinition indexDefinition, String clusterIndexName,
+  public void create(OIndexDefinition indexDefinition, String clusterIndexName,
       OStreamSerializer valueSerializer, boolean isAutomatic) {
 
   }
 
-  public void createIndex(String indexName, OIndexDefinition indexDefinition, String clusterIndexName,
+  public void createIndex(OIndexDefinition indexDefinition, String clusterIndexName,
       OStreamSerializer valueSerializer, boolean isAutomatic, ODocument metadata) {
     // PREVENT EXCEPTION
     if (mgrWriter == null)
@@ -442,4 +442,8 @@ public abstract void onRecordAddedToResultSet(QueryContext queryContext, OContex
   public int getVersion() {
     return 0;
   }
+
+  public void setIndexName(String indexName) {
+    this.indexName = indexName;
+  }
 }