Author: sannegrinovero Date: 2010-02-04 13:25:03 -0500 (Thu, 04 Feb 2010) New Revision: 18694 Modified: search/branches/Branch_3_1/src/main/java/org/hibernate/search/store/FSMasterDirectoryProvider.java search/branches/Branch_3_1/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java Log: HSEARCH-452 (branch 3.1) FSMasterDirectoryProvider: typo in marker file name (Stephan Bublava) Modified: search/branches/Branch_3_1/src/main/java/org/hibernate/search/store/FSMasterDirectoryProvider.java =================================================================== --- search/branches/Branch_3_1/src/main/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2010-02-04 18:04:33 UTC (rev 18693) +++ search/branches/Branch_3_1/src/main/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2010-02-04 18:25:03 UTC (rev 18694) @@ -33,6 +33,11 @@ //TODO rename copy? public class FSMasterDirectoryProvider implements DirectoryProvider<FSDirectory> { + private static final String CURRENT1 = "current1"; + private static final String CURRENT2 = "current2"; + // defined to have CURRENT_DIR_NAME[1] == "current"+"1": + private static final String[] CURRENT_DIR_NAME = { null, CURRENT1, CURRENT2 }; + private static final Logger log = LoggerFactory.make(); private final Timer timer = new Timer( true ); //daemon thread, the copy algorithm is robust @@ -74,10 +79,10 @@ int currentLocal = 0; try { //copy to source - if ( new File( sourceDir, "current1").exists() ) { + if ( new File( sourceDir, CURRENT1 ).exists() ) { currentLocal = 2; } - else if ( new File( sourceDir, "current2").exists() ) { + else if ( new File( sourceDir, CURRENT2 ).exists() ) { currentLocal = 1; } else { @@ -87,10 +92,10 @@ String currentString = Integer.valueOf( currentLocal ).toString(); File subDir = new File( sourceDir, currentString ); FileHelper.synchronize( indexDir, subDir, true, copyChunkSize ); - new File( sourceDir, "current1 ").delete(); - new File( sourceDir, "current2" ).delete(); + new File( sourceDir, CURRENT1 ).delete(); + new File( sourceDir, CURRENT2 ).delete(); //TODO small hole, no file can be found here - new File( sourceDir, "current" + currentString ).createNewFile(); + new File( sourceDir, CURRENT_DIR_NAME[currentLocal] ).createNewFile(); log.debug( "Current directory: {}", currentLocal ); } catch (IOException e) { @@ -196,11 +201,11 @@ log.error( "Unable to synchronize source of " + indexName, e ); return; } - if ( ! new File( destination, "current" + oldIndex ).delete() ) { + if ( ! new File( destination, CURRENT_DIR_NAME[oldIndex] ).delete() ) { log.warn( "Unable to remove previous marker file from source of {}", indexName ); } try { - new File( destination, "current" + index ).createNewFile(); + new File( destination, CURRENT_DIR_NAME[index] ).createNewFile(); } catch( IOException e ) { log.warn( "Unable to create current marker in source of " + indexName, e ); Modified: search/branches/Branch_3_1/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java =================================================================== --- search/branches/Branch_3_1/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2010-02-04 18:04:33 UTC (rev 18693) +++ search/branches/Branch_3_1/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2010-02-04 18:25:03 UTC (rev 18694) @@ -154,8 +154,8 @@ FSSlaveDirectoryProvider other = ( FSSlaveDirectoryProvider ) obj; //need to break memory barriers on both instances: @SuppressWarnings("unused") - int readCurrentState = this.current; //unneded value, but ensure visibility of indexName - readCurrentState = other.current; //another unneded value, but ensure visibility of indexName + int readCurrentState = this.current; //unneeded value, but ensure visibility of indexName + readCurrentState = other.current; //another unneeded value, but ensure visibility of indexName return indexName.equals( other.indexName ); } Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java =================================================================== --- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java 2010-02-04 18:04:33 UTC (rev 18693) +++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java 2010-02-04 18:25:03 UTC (rev 18694) @@ -40,7 +40,7 @@ } /** - * The lucene index directory which is shared bewtween master and slave. + * The lucene index directory which is shared between master and slave. */ private String masterCopy = "/master/copy";