[Joafip-svn] SF.net SVN: joafip:[3014] trunk/joafip-heapfile/src
Brought to you by:
luc_peuvrier
Menu
▾
▴
[Joafip-svn] SF.net SVN: joafip:[3014] trunk/joafip-heapfile/src
|
From: <luc...@us...> - 2012-04-17 19:01:44
|
Revision: 3014
http://joafip.svn.sourceforge.net/joafip/?rev=3014&view=rev
Author: luc_peuvrier
Date: 2012-04-17 19:01:37 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
dead code removed
Modified Paths:
--------------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/HeapElementManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IHeapElementManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapElementManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapRecordManage.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestStoreRestore.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/FileDataManagerIntegrityChecker.java
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java 2012-04-17 06:44:59 UTC (rev 3013)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java 2012-04-17 19:01:37 UTC (rev 3014)
@@ -129,8 +129,6 @@
private HeapFreeNode freeNode;
- private int readSession = -1;
-
/** the area size in file ( record header size + data size ) */
private Integer areaSize;
@@ -620,13 +618,11 @@
// ASSERTX
assert !freeRecord : "is free record";
updateIdNodeData();
- final int currentReadSession = heapElementManager.getReadSession();
- if (idNode == null || readSession != currentReadSession) {
+ if (idNode == null) {
idNode = new HeapIdNode(heapElementManager, positionInFile,
parentPositionInFile, leftPositionInFile,
rightPositionInFile, colorSetted, color, numberOfChild,
nodeIdentifier);
- readSession = currentReadSession;
}
return idNode;
}
@@ -635,13 +631,11 @@
// ASSERTX
assert freeRecord : "is data record";
updateFreeNodeData();
- final int currentReadSession = heapElementManager.getReadSession();
- if (freeNode == null || readSession != currentReadSession) {
+ if (freeNode == null) {
freeNode = new HeapFreeNode(heapElementManager, positionInFile,
parentPositionInFile, leftPositionInFile,
rightPositionInFile, colorSetted, color, numberOfChild,
areaSize);
- readSession = currentReadSession;
}
return freeNode;
}
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/HeapElementManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/HeapElementManager.java 2012-04-17 06:44:59 UTC (rev 3013)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/HeapElementManager.java 2012-04-17 19:01:37 UTC (rev 3014)
@@ -210,8 +210,6 @@
private final boolean fileOpenedInTransaction;
- private int readSession;
-
private final boolean deleteRenamig;
private final boolean clearResizeFile;
@@ -573,7 +571,7 @@
stopperTrace = new Exception("stopper trace");
serviceStarted = false;
if (!fileOpenedInTransaction) {
- closeFile();
+ closeFiles();
}
}
@@ -628,7 +626,7 @@
header.writeToFile();
flushOnFile();
if (fileOpenedInTransaction) {
- closeFile();
+ closeFiles();
openFile();
}
} else {
@@ -691,25 +689,6 @@
}
@Override
- public void clearNotToWrite() throws HeapException {
- // was for debug assert
- // for (HeapRecord heapRecord : readHeapRecordMap.values()) {
- // // if (heapRecord.isValueChangedToSave()) {
- // // throw new HeapRuntimeException("must not be in read cache");
- // // }
- // }
-
- // FIXMELUC x this increase execution time
- // readHeapRecordMap.clear();
- // readSession++;
- }
-
- @Override
- public int getReadSession() {
- return readSession;
- }
-
- @Override
public void closeTransaction() throws HeapException {
// ASSERTX
assert assertTransactionOpened();
@@ -735,7 +714,7 @@
flushOnFile();
}
if (fileOpenedInTransaction) {
- closeFile();
+ closeFiles();
}
openedTransaction = false;
}
@@ -747,7 +726,7 @@
clearHeaprecordToWriteMap();
readHeapRecordMap.clear();
if (fileOpenedInTransaction) {
- closeFile();
+ closeFiles();
}
openedTransaction = false;
}
@@ -756,7 +735,7 @@
heapRecordToWriteMap.clear();
}
- private void closeFile() throws HeapException {
+ private void closeFiles() throws HeapException {
try {
if (openFileTraceFile != null && !openFileTraceFile.delete()) {
LOGGER.error("while deleting open file trace");
@@ -1151,6 +1130,17 @@
return readHeapRecordMap.size() + heapRecordToWriteMap.size();
}
+ @Override
+ public void setDataRecordKeyManager(
+ final IDataRecordKeyManager dataRecordKeyManager) {
+ this.dataRecordKeyManager = dataRecordKeyManager;
+ }
+
+ @Override
+ public IDataRecordKeyManager getDataRecordKeyManager() {
+ return dataRecordKeyManager;
+ }
+
/**
* FOR TEST ONLY<br>
*
@@ -1174,15 +1164,4 @@
public HeapRecord getHeapFileRecordInWriteCache(final long positionInFile) {
return heapRecordToWriteMap.get(positionInFile);
}
-
- @Override
- public void setDataRecordKeyManager(
- final IDataRecordKeyManager dataRecordKeyManager) {
- this.dataRecordKeyManager = dataRecordKeyManager;
- }
-
- @Override
- public IDataRecordKeyManager getDataRecordKeyManager() {
- return dataRecordKeyManager;
- }
}
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IHeapElementManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IHeapElementManager.java 2012-04-17 06:44:59 UTC (rev 3013)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IHeapElementManager.java 2012-04-17 19:01:37 UTC (rev 3014)
@@ -105,15 +105,6 @@
void closeTransaction() throws HeapException;
/**
- * clear from memory not to write record (the read heap record cache)
- *
- * @throws HeapException
- */
- void clearNotToWrite() throws HeapException;
-
- int getReadSession();
-
- /**
* close the heap file transaction management without commit modification in
* file
*
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java 2012-04-17 06:44:59 UTC (rev 3013)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java 2012-04-17 19:01:37 UTC (rev 3014)
@@ -268,7 +268,6 @@
logger.debug("create heap record #" + dataRecordIdentifier
+ FOR_DATA_SIZE + data.length);
}
- heapElementManager.clearNotToWrite();
return created;
}
@@ -348,7 +347,6 @@
deleteDataRecord(heapIdNode);
deleted = true;
}
- heapElementManager.clearNotToWrite();
return deleted;
}
@@ -677,7 +675,6 @@
} else {
dataAssociated = heapRecord.getDataAssociated();
}
- heapElementManager.clearNotToWrite();
return dataAssociated;
}
@@ -825,7 +822,6 @@
final DataRecordIdentifier dataRecordIdentifier)
throws HeapException {
final boolean haveDataRecord = idNodeSearchMayBeNotExist(dataRecordIdentifier) != null;
- heapElementManager.clearNotToWrite();
return haveDataRecord;
}
@@ -1020,11 +1016,6 @@
@Override
protected void closeHeapManagerAfterException() {
try {
- heapElementManager.clearNotToWrite();
- } catch (Exception exception) {
- logger.warn("closing after exception", exception);
- }
- try {
if (heapElementManager.isTransactionOpened()) {
heapElementManager.closeTransactionDiscardChange();
}
@@ -1067,7 +1058,6 @@
} catch (RBTException exception) {
throw new HeapException(exception);
}
- heapElementManager.clearNotToWrite();
return numberOfDataRecord;
}
@@ -1079,7 +1069,6 @@
} catch (RBTException exception) {
throw new HeapException(exception);
}
- heapElementManager.clearNotToWrite();
return numberOfFreeRecord;
}
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapElementManager.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapElementManager.java 2012-04-17 06:44:59 UTC (rev 3013)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapElementManager.java 2012-04-17 19:01:37 UTC (rev 3014)
@@ -128,7 +128,6 @@
heapElementManager.startService();
heapElementManager.openTransaction();
getHeapHeaderAndCheckPosition(heapHeader1);
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.stopService();
}
@@ -158,7 +157,6 @@
// heapElementManager, heapRecord).getPositionInFile());
heapHeader2.setIdRootNodeFilePosition(heapRecord.getPositionInFile());
/* write modifications */
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
/* read the last modification */
@@ -174,7 +172,6 @@
+ HeapHeader.HEAP_HEADER_SIZE, HeapHeader.HEAP_HEADER_SIZE,
heapHeader3.getIdRootNodeFilePosition());
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.stopService();
}
@@ -221,7 +218,6 @@
assertEquals("read must be equals appened", heapRecordAppened2,
heapRecord2);
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.stopService();
}
@@ -238,7 +234,6 @@
data1[index] = (byte) (data1.length - index);
}
heapRecord1.setDataAssociated(data1);
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.openTransaction();
@@ -247,7 +242,6 @@
for (int index = 0; index < data1.length; index++) {
assertEquals("bad record data", data1.length - index, data1[index]);
}
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.stopService();
@@ -283,7 +277,6 @@
node.setColor(!color);
assertTrue("value must have changed",
heapRecord1.isValueChangedToSave());
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.openTransaction();
@@ -291,7 +284,6 @@
node = heapRecord1.getIdNode();
assertEquals("color must have changed", !color, node.getColor());
assertFalse("not modified record", heapRecord1.isValueChangedToSave());
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.openTransaction();
@@ -315,14 +307,12 @@
color = true;
}
node.setColor(!color);
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.openTransaction();
heapRecord1 = heapElementManager.readHeapFileDataRecord(pos);
node = heapRecord1.getFreeNode();
assertEquals("color must have changed", !color, node.getColor());
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.stopService();
}
@@ -353,7 +343,6 @@
// heapRecord1.createDataArea();
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.openTransaction();
@@ -370,7 +359,6 @@
assertNotNull("must be in cache",
heapElementManager.getHeapFileRecordInReadCache(pos));
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.stopService();
}
@@ -394,7 +382,6 @@
// .isValueChangedToSave());
assertFalse("created header must be saved",
heapHeader1.isValueChangedToSave());
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.stopService();
assertFalse("saving implies no more value changed",
@@ -439,7 +426,6 @@
}
heapRecordAppened1.setDataAssociated(testData);
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
logger.debug("appened heap record1\n" + heapRecordAppened1.toString());
@@ -453,7 +439,6 @@
* crc32
*/);
heapRecordAppened2.setDataAssociated(testData);
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.stopService();
logger.debug("appened heap record2\n" + heapRecordAppened2.toString());
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapRecordManage.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapRecordManage.java 2012-04-17 06:44:59 UTC (rev 3013)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapRecordManage.java 2012-04-17 19:01:37 UTC (rev 3014)
@@ -164,7 +164,6 @@
previousPosition = position;
final HeapIdNode node = (HeapIdNode) heapRecord.getIdNode();
idNodeTree.append(node);
- heapElementManager.clearNotToWrite();
heapElementManager.closeTransaction();
heapElementManager.openTransaction();
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestStoreRestore.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestStoreRestore.java 2012-04-17 06:44:59 UTC (rev 3013)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestStoreRestore.java 2012-04-17 19:01:37 UTC (rev 3014)
@@ -232,16 +232,6 @@
}
@Override
- public void clearNotToWrite() {
- // do nothing
- }
-
- @Override
- public int getReadSession() {
- return 0;
- }
-
- @Override
public void closeTransaction() throws HeapException {// NOPMD do nothing
}
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/FileDataManagerIntegrityChecker.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/FileDataManagerIntegrityChecker.java 2012-04-17 06:44:59 UTC (rev 3013)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/FileDataManagerIntegrityChecker.java 2012-04-17 19:01:37 UTC (rev 3014)
@@ -125,7 +125,6 @@
checkTotalNumberOfRecord(freeRecordCount, dataRecordCount);
}
- heapElementManager.clearNotToWrite();
}
private void checkFreeNodeInTree(final HeapRecord heapRecord)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
