[Joafip-svn] SF.net SVN: joafip:[3159] trunk/joafip-kvstore/src
Brought to you by:
luc_peuvrier
|
From: <luc...@us...> - 2012-11-22 06:54:46
|
Revision: 3159
http://joafip.svn.sourceforge.net/joafip/?rev=3159&view=rev
Author: luc_peuvrier
Date: 2012-11-22 06:54:40 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
foreground garbage changed
Modified Paths:
--------------
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/AbstractHeapDataManager.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/IHeapDataManager.java
trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/BlockDataManager.java
trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/DualWrapDataManager.java
trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/HeapMemoryDataManagerMock.java
trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/HeapMultiFileDataManager.java
Modified: trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/AbstractHeapDataManager.java
===================================================================
--- trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/AbstractHeapDataManager.java 2012-11-22 06:54:24 UTC (rev 3158)
+++ trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/AbstractHeapDataManager.java 2012-11-22 06:54:40 UTC (rev 3159)
@@ -175,12 +175,17 @@
@Override
final public void stopService() throws HeapException {
+ stopService(false);
+ }
+
+ @Override
+ public void stopService(final boolean removeFiles) throws HeapException {
try {
// ASSERTX
assert assertStarted();
started = false;
stopperStackTrace = new Exception("stopper stack trace");// NOPMD
- stopServiceImpl();
+ stopServiceImpl(removeFiles);
} catch (HeapException exception) {
logger.fatal(STOP_SERVICE_FAILED, exception);
closeHeapManagerAfterException();
@@ -197,7 +202,7 @@
*
* @throws HeapException
*/
- protected abstract void stopServiceImpl() throws HeapException;
+ protected abstract void stopServiceImpl(boolean removeFiles) throws HeapException;
@Override
public boolean isServiceStarted() {
Modified: trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/IHeapDataManager.java
===================================================================
--- trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/IHeapDataManager.java 2012-11-22 06:54:24 UTC (rev 3158)
+++ trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/IHeapDataManager.java 2012-11-22 06:54:40 UTC (rev 3159)
@@ -57,16 +57,18 @@
* read/write error, file restored from stable backup, file
* management is not opened, no file in stable state
*/
- void startService(final boolean removeFiles) throws HeapException;
+ void startService(boolean removeFiles) throws HeapException;
/**
* stop heap data manager service, do not flush in file any modification.
- * modification are lost
+ * modification are lost, files not removed.
*
* @throws HeapException
*/
void stopService() throws HeapException;
+ void stopService(boolean removeFiles) throws HeapException;
+
/**
*
* @return true if service started
Modified: trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/BlockDataManager.java
===================================================================
--- trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/BlockDataManager.java 2012-11-22 06:54:24 UTC (rev 3158)
+++ trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/BlockDataManager.java 2012-11-22 06:54:40 UTC (rev 3159)
@@ -125,10 +125,13 @@
}
@Override
- protected void stopServiceImpl() throws HeapException {
+ protected void stopServiceImpl(final boolean removeFles) throws HeapException {
try {
writeHeader();
randomAccessFile.close();
+ if( removeFles) {
+ removeFiles();
+ }
} catch (FileIOException exception) {
throw new HeapException(exception);
}
Modified: trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/DualWrapDataManager.java
===================================================================
--- trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/DualWrapDataManager.java 2012-11-22 06:54:24 UTC (rev 3158)
+++ trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/DualWrapDataManager.java 2012-11-22 06:54:40 UTC (rev 3159)
@@ -68,6 +68,12 @@
}
@Override
+ public void stopService(final boolean removeFiles) throws HeapException {
+ firstDataManager.stopService(removeFiles);
+ secondDataManager.stopService(removeFiles);
+ }
+
+ @Override
public boolean isServiceStarted() {
final boolean started1 = firstDataManager.isServiceStarted();
final boolean started2 = secondDataManager.isServiceStarted();
Modified: trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/HeapMemoryDataManagerMock.java
===================================================================
--- trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/HeapMemoryDataManagerMock.java 2012-11-22 06:54:24 UTC (rev 3158)
+++ trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/HeapMemoryDataManagerMock.java 2012-11-22 06:54:40 UTC (rev 3159)
@@ -73,9 +73,12 @@
}
@Override
- protected void stopServiceImpl() throws HeapException {
+ protected void stopServiceImpl(final boolean removeFiles) throws HeapException {
toWritePendigRecordMap.clear();
toDeletePending.clear();
+ if( removeFiles) {
+ removeFiles();
+ }
}
@Override
Modified: trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/HeapMultiFileDataManager.java
===================================================================
--- trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/HeapMultiFileDataManager.java 2012-11-22 06:54:24 UTC (rev 3158)
+++ trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/HeapMultiFileDataManager.java 2012-11-22 06:54:40 UTC (rev 3159)
@@ -68,7 +68,7 @@
}
@Override
- protected void stopServiceImpl() throws HeapException {
+ protected void stopServiceImpl(final boolean removeFiles) throws HeapException {
// no implementation
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|