Skip to content

Commit

Permalink
fixed bug deletion on spatial index
Browse files Browse the repository at this point in the history
  • Loading branch information
wolf4ood committed Dec 30, 2014
1 parent aea4607 commit ec08d7e
Show file tree
Hide file tree
Showing 4 changed files with 312 additions and 197 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -97,7 +97,7 @@
<surefire.version>2.17</surefire.version> <surefire.version>2.17</surefire.version>
<javac.src.version>1.6</javac.src.version> <javac.src.version>1.6</javac.src.version>
<javac.target.version>1.6</javac.target.version> <javac.target.version>1.6</javac.target.version>
<orientdb.version>2.0-rc1</orientdb.version> <orientdb.version>2.0-SNAPSHOT</orientdb.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>


Expand Down
Expand Up @@ -104,6 +104,10 @@ public void addDocument(Document doc) {
public void deleteDocument(Query query) { public void deleteDocument(Query query) {
try { try {
reopenToken = mgrWriter.deleteDocuments(query); reopenToken = mgrWriter.deleteDocuments(query);
if (!mgrWriter.getIndexWriter().hasDeletions()) {
OLogManager.instance().error(this, "Error on deleting document by query '%s' to Lucene index",
new OIndexException("Error deleting document"), query);
}
} catch (IOException e) { } catch (IOException e) {
OLogManager.instance().error(this, "Error on deleting document by query '%s' to Lucene index", e, query); OLogManager.instance().error(this, "Error on deleting document by query '%s' to Lucene index", e, query);
} }
Expand Down Expand Up @@ -205,15 +209,29 @@ public void load(ORID indexRid, String indexName, OIndexDefinition indexDefiniti
} }


public long size(ValuesTransformer<V> transformer) { public long size(ValuesTransformer<V> transformer) {

IndexReader reader = null; IndexReader reader = null;
IndexSearcher searcher = null;
try { try {
reader = getSearcher().getIndexReader(); reader = getSearcher().getIndexReader();
} catch (IOException e) { } catch (IOException e) {
OLogManager.instance().error(this, "Error on getting size of Lucene index", e); OLogManager.instance().error(this, "Error on getting size of Lucene index", e);
} finally {
if (searcher != null) {
release(searcher);
}
} }
return reader.numDocs(); return reader.numDocs();
} }


public void release(IndexSearcher searcher) {
try {
searcherManager.release(searcher);
} catch (IOException e) {
OLogManager.instance().error(this, "Error on releasing index searcher of Lucene index", e);
}
}

public void setManagedIndex(OIndex index) { public void setManagedIndex(OIndex index) {
this.managedIndex = index; this.managedIndex = index;
} }
Expand Down

0 comments on commit ec08d7e

Please sign in to comment.