You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2014/02/21 09:20:51 UTC
svn commit: r1570486 - in /jackrabbit/oak/trunk/oak-lucene: pom.xml
src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
Author: tommaso
Date: Fri Feb 21 08:20:51 2014
New Revision: 1570486
URL: http://svn.apache.org/r1570486
Log:
OAK-1442 - export Lucene packages, plus dumped to latest Lucene version
Modified:
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1570486&r1=1570485&r2=1570486&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Fri Feb 21 08:20:51 2014
@@ -34,7 +34,7 @@
<properties>
<tika.version>1.3</tika.version>
- <lucene.version>4.3.0</lucene.version>
+ <lucene.version>4.6.1</lucene.version>
<known.issues>
<!-- Jackrabbit query tests -->
org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtEnd <!-- OAK-318 -->
@@ -105,6 +105,10 @@
org.apache.jackrabbit.oak.plugins.index.lucene,
org.apache.jackrabbit.oak.plugins.index.lucene.util
</Export-Package>
+ <_exportcontents>
+ org.apache.lucene.*;version=${lucene.version};-split-package:=merge-first,
+ org.tartarus.snowball.*;version=${lucene.version};-split-package:=merge-first
+ </_exportcontents>
<Embed-Dependency>lucene-*;inline=true</Embed-Dependency>
</instructions>
</configuration>
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java?rev=1570486&r1=1570485&r2=1570486&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java Fri Feb 21 08:20:51 2014
@@ -25,7 +25,7 @@ public interface LuceneIndexConstants {
String INDEX_DATA_CHILD_NAME = ":data";
- Version VERSION = Version.LUCENE_43;
+ Version VERSION = Version.LUCENE_46;
Analyzer ANALYZER = new OakAnalyzer(VERSION);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java?rev=1570486&r1=1570485&r2=1570486&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java Fri Feb 21 08:20:51 2014
@@ -16,25 +16,14 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import static com.google.common.base.Preconditions.checkElementIndex;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkPositionIndexes;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
-import static org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED;
-import static org.apache.jackrabbit.oak.api.Type.BINARIES;
-
+import com.google.common.collect.Iterables;
+import com.google.common.io.ByteStreams;
import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import java.util.List;
-
-import com.google.common.collect.Iterables;
-import com.google.common.io.ByteStreams;
-
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -42,8 +31,19 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.store.Lock;
+import org.apache.lucene.store.LockFactory;
import org.apache.lucene.store.NoLockFactory;
+import static com.google.common.base.Preconditions.checkElementIndex;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkPositionIndexes;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
+import static org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED;
+import static org.apache.jackrabbit.oak.api.Type.BINARIES;
+
/**
* Implementation of the Lucene {@link Directory} (a flat list of files)
* based on an Oak {@link NodeBuilder}.
@@ -51,6 +51,7 @@ import org.apache.lucene.store.NoLockFac
class OakDirectory extends Directory {
protected final NodeBuilder directoryBuilder;
+ private LockFactory lockFactory;
public OakDirectory(NodeBuilder directoryBuilder) {
this.lockFactory = NoLockFactory.getNoLockFactory();
@@ -103,6 +104,16 @@ class OakDirectory extends Directory {
}
@Override
+ public Lock makeLock(String name) {
+ return lockFactory.makeLock(name);
+ }
+
+ @Override
+ public void clearLock(String name) throws IOException {
+ lockFactory.clearLock(name);
+ }
+
+ @Override
public void sync(Collection<String> names) throws IOException {
// ?
}
@@ -112,6 +123,16 @@ class OakDirectory extends Directory {
// do nothing
}
+ @Override
+ public void setLockFactory(LockFactory lockFactory) throws IOException {
+ this.lockFactory = lockFactory;
+ }
+
+ @Override
+ public LockFactory getLockFactory() {
+ return lockFactory;
+ }
+
private static final int BLOB_SIZE = 32 * 1024; // > blob inline limit
private static class OakIndexFile {