db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1592543 - in /db/derby/code/trunk: java/optional/org/apache/derby/optional/lucene/ java/testing/org/apache/derbyTesting/functionTests/tests/lang/ tools/java/
Date Mon, 05 May 2014 14:38:51 GMT
Author: rhillegas
Date: Mon May  5 14:38:50 2014
New Revision: 1592543

URL: http://svn.apache.org/r1592543
Log:
DERBY-590: Change the checked-in version of Lucene from 4.5.0 to 4.7.1; commit derby-590-29-aa-useLucene_4.7.1.diff.

Modified:
    db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/DerbyLuceneDir.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java
    db/derby/code/trunk/tools/java/lucene-analyzers-common.jar
    db/derby/code/trunk/tools/java/lucene-core.jar
    db/derby/code/trunk/tools/java/lucene-queryparser.jar

Modified: db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/DerbyLuceneDir.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/DerbyLuceneDir.java?rev=1592543&r1=1592542&r2=1592543&view=diff
==============================================================================
--- db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/DerbyLuceneDir.java
(original)
+++ db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/DerbyLuceneDir.java
Mon May  5 14:38:50 2014
@@ -34,6 +34,8 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.Lock;
+import org.apache.lucene.store.LockFactory;
 import org.apache.lucene.store.SingleInstanceLockFactory;
 
 import org.apache.derby.database.Database;
@@ -70,6 +72,9 @@ class DerbyLuceneDir extends Directory
     // files open for output which may need to be sync'd
     private HashMap<String,DerbyIndexOutput>    _outputFiles = new HashMap<String,DerbyIndexOutput>();
 
+    // Lucene lock factory
+    private LockFactory             _lockFactory;
+    
     private boolean _closed = false;
 
     // only supply one DerbyLuceneDir per database
@@ -173,6 +178,25 @@ class DerbyLuceneDir extends Directory
     //
     /////////////////////////////////////////////////////////////////////
 
+    /** Set the lock factory used by this Directory. */
+    public  void    setLockFactory( LockFactory lockFactory ) { _lockFactory = lockFactory;
}
+    
+    /** Get the lock factory used by this Directory. */
+    public  LockFactory getLockFactory() { return _lockFactory; }
+
+    /** Clear the lock */
+    public void clearLock( String name )
+        throws IOException
+    {
+        _lockFactory.clearLock( name );
+    }
+
+    /** Make a lock */
+    public Lock makeLock( String name )
+    {
+        return _lockFactory.makeLock( name );
+    }
+
     /**
      * <p>
      * Close this directory and remove it from the map of open directories.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java?rev=1592543&r1=1592542&r2=1592543&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java
Mon May  5 14:38:50 2014
@@ -74,7 +74,7 @@ public class LuceneSupportPermsTest exte
     ///////////////////////////////////////////////////////////////////////////////////
 
     private static  final   String      LUCENE_VERSION_PROPERTY = "derby.tests.lucene.version";
-    private static  String              LUCENE_VERSION = "LUCENE_45";
+    private static  String              LUCENE_VERSION = "LUCENE_47";
 
     private static  final   String      DB_NAME = "lucenesupportpermsdb";
 

Modified: db/derby/code/trunk/tools/java/lucene-analyzers-common.jar
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/java/lucene-analyzers-common.jar?rev=1592543&r1=1592542&r2=1592543&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/derby/code/trunk/tools/java/lucene-core.jar
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/java/lucene-core.jar?rev=1592543&r1=1592542&r2=1592543&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/derby/code/trunk/tools/java/lucene-queryparser.jar
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/java/lucene-queryparser.jar?rev=1592543&r1=1592542&r2=1592543&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message