[Joafip-svn] SF.net SVN: joafip:[3046] trunk
Brought to you by:
luc_peuvrier
Menu
▾
▴
[Joafip-svn] SF.net SVN: joafip:[3046] trunk
|
From: <luc...@us...> - 2012-04-29 20:05:50
|
Revision: 3046
http://joafip.svn.sourceforge.net/joafip/?rev=3046&view=rev
Author: luc_peuvrier
Date: 2012-04-29 20:05:43 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
WIP btree plus: implementation independant move to common joafip-kvstore
Modified Paths:
--------------
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManagerBackup.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManagerFreeing.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrMemoryLeak.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithKey.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithScenario.java
trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/AbstractTestHeapDataManager.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/heapfile/service/HeapFileServiceTests.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/kvstore/KeyValueStoreTests.java
Added Paths:
-----------
trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/TestBlockDataManager.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/kvstore/service/KeyValueStoreServiceTests.java
Removed Paths:
-------------
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestBlockDataManager.java
Deleted: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestBlockDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestBlockDataManager.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestBlockDataManager.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011 Luc Peuvrier
- *
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
- * Licensed under the LGPL License, Version 3, 29 June 2007 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.gnu.org/licenses/lgpl.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.sf.joafip.heapfile.service;
-
-import net.sf.joafip.DoNotTransform;
-import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.TestException;
-import net.sf.joafip.kvstore.entity.HeapFileSetup;
-import net.sf.joafip.kvstore.service.AbstractTestHeapDataManagerImpl;
-import net.sf.joafip.kvstore.service.HeapException;
-import net.sf.joafip.kvstore.service.IHeapDataManager;
-
-@NotStorableClass
-@DoNotTransform
-public class TestBlockDataManager extends AbstractTestHeapDataManagerImpl {// NOPMD
-
- public TestBlockDataManager() throws TestException {
- super();
- }
-
- public TestBlockDataManager(final String name) throws TestException {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception {// NOPMD
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {// NOPMD
- super.tearDown();
- }
-
- @Override
- protected IHeapDataManager createHeapDataManager(final HeapFileSetup setup)
- throws HeapException {
- return new HeapFileDataManager(setup, false);
- }
-
- @Override
- protected void createHeap(final boolean removeFile) throws HeapException {
- createBlockDataManager(removeFile);
- }
-
- @Override
- protected void checkIntegrity() throws HeapException {
- HeapFileDataManagerIntegrityChecker.getInstance().checkIntegrity(
- heapDataManager);
- }
-
- @Override
- protected boolean manageFreeRecord() {
- return false;
- }
-}
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManager.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManager.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -54,7 +54,7 @@
@Override
protected void createHeap(final boolean removeFile) throws HeapException {
- createHeapFileDataManager(removeFile);
+ createFileHeapDataManager(removeFile);
}
@Override
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManagerBackup.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManagerBackup.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManagerBackup.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -55,7 +55,7 @@
@Override
protected void createHeap(final boolean removeFile) throws HeapException {
- createHeapFileDataManager(removeFile);
+ createFileHeapDataManager(removeFile);
}
@Override
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManagerFreeing.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManagerFreeing.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataManagerFreeing.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -47,7 +47,7 @@
@Override
protected void createHeap(final boolean removeFile) throws HeapException {
- createHeapFileDataManager(removeFile);
+ createFileHeapDataManager(removeFile);
}
@Override
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrMemoryLeak.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrMemoryLeak.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrMemoryLeak.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -42,7 +42,7 @@
@Override
protected void createHeap(final boolean removeFile) throws HeapException {
- createHeapFileDataManager(removeFile);
+ createFileHeapDataManager(removeFile);
}
@Override
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithKey.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithKey.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithKey.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -69,7 +69,7 @@
public void testUseAsAMap() throws HeapException {
final DataRecordKeyManager keyManager = DataRecordKeyManager
.getInstance();
- createHeapFileDataManager(true);
+ createFileHeapDataManager(true);
heapDataManager.setDataRecordKeyComparator(keyManager);
final DataRecordIdentifier keyA = keyManager.createKey("A");
assertFalse("must not found 'A'", heapDataManager.hasDataRecord(keyA));
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithScenario.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithScenario.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithScenario.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -64,7 +64,7 @@
@Override
protected void createHeap(final boolean removeFile) throws HeapException {
- createHeapFileDataManager(removeFile);
+ createFileHeapDataManager(removeFile);
}
@Override
Modified: trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/AbstractTestHeapDataManager.java
===================================================================
--- trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/AbstractTestHeapDataManager.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/AbstractTestHeapDataManager.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -118,7 +118,7 @@
* @throws HeapException
*
*/
- protected void createHeapFileDataManager(final boolean removeFile)
+ protected void createFileHeapDataManager(final boolean removeFile)
throws HeapException {
final HeapFileSetup setup = new HeapFileSetup(dataFile,
true/* crashSafeMode */, false/* useCacheMode */,
@@ -134,12 +134,6 @@
protected abstract IHeapDataManager createHeapDataManager(
HeapFileSetup setup) throws HeapException;
- protected void createBlockDataManager(final boolean removeFile)
- throws HeapException {
- heapDataManager = new BlockDataManager(dataFilePath, 20000);
- heapDataManager.startService(removeFile);
- }
-
protected abstract void createHeap(final boolean removeFile)
throws HeapException;
Copied: trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/TestBlockDataManager.java (from rev 3045, trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestBlockDataManager.java)
===================================================================
--- trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/TestBlockDataManager.java (rev 0)
+++ trunk/joafip-kvstore/src/test/java/net/sf/joafip/kvstore/service/TestBlockDataManager.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2011 Luc Peuvrier
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sf.joafip.kvstore.service;
+
+import net.sf.joafip.DoNotTransform;
+import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.TestException;
+import net.sf.joafip.kvstore.entity.HeapFileSetup;
+
+@NotStorableClass
+@DoNotTransform
+public class TestBlockDataManager extends AbstractTestHeapDataManagerImpl {// NOPMD
+
+ public TestBlockDataManager() throws TestException {
+ super();
+ }
+
+ public TestBlockDataManager(final String name) throws TestException {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {// NOPMD
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {// NOPMD
+ super.tearDown();
+ }
+
+ @Override
+ protected IHeapDataManager createHeapDataManager(final HeapFileSetup setup)
+ throws HeapException {
+ // return new HeapFileDataManager(setup, false);
+ throw new HeapException("not implemented");
+ }
+
+ @Override
+ protected void createHeap(final boolean removeFile) throws HeapException {
+ heapDataManager = new BlockDataManager(dataFilePath, 20000);
+ heapDataManager.startService(removeFile);
+ }
+
+ @Override
+ protected void checkIntegrity() throws HeapException {
+ // HeapFileDataManagerIntegrityChecker.getInstance().checkIntegrity(
+ // heapDataManager);
+ }
+
+ @Override
+ protected boolean manageFreeRecord() {
+ return false;
+ }
+}
Modified: trunk/joafip-testsuite/src/main/java/net/sf/joafip/heapfile/service/HeapFileServiceTests.java
===================================================================
--- trunk/joafip-testsuite/src/main/java/net/sf/joafip/heapfile/service/HeapFileServiceTests.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-testsuite/src/main/java/net/sf/joafip/heapfile/service/HeapFileServiceTests.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -35,7 +35,6 @@
suite.addTestSuite(TestHeapFileDataManagerFreeing.class);
suite.addTestSuite(TestHeapFileDataManagerBackup.class);
suite.addTestSuite(TestHeapFileDataMgrWithScenario.class);
- suite.addTestSuite(TestBlockDataManager.class);
suite.addTestSuite(TestHeapFileDataMgrWithKey.class);
// $JUnit-END$
return suite;
Modified: trunk/joafip-testsuite/src/main/java/net/sf/joafip/kvstore/KeyValueStoreTests.java
===================================================================
--- trunk/joafip-testsuite/src/main/java/net/sf/joafip/kvstore/KeyValueStoreTests.java 2012-04-29 16:58:13 UTC (rev 3045)
+++ trunk/joafip-testsuite/src/main/java/net/sf/joafip/kvstore/KeyValueStoreTests.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -20,6 +20,7 @@
import junit.framework.TestSuite;
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.kvstore.record.KVRecordTests;
+import net.sf.joafip.kvstore.service.KeyValueStoreServiceTests;
@NotStorableClass
public class KeyValueStoreTests {
@@ -32,6 +33,7 @@
final TestSuite suite = new TestSuite("Test for key value store");
// $JUnit-BEGIN$
suite.addTest(KVRecordTests.suite());
+ suite.addTest(KeyValueStoreServiceTests.suite());
// suite.addTest(HeapFileServiceTests.suite());
// $JUnit-END$
return suite;
Added: trunk/joafip-testsuite/src/main/java/net/sf/joafip/kvstore/service/KeyValueStoreServiceTests.java
===================================================================
--- trunk/joafip-testsuite/src/main/java/net/sf/joafip/kvstore/service/KeyValueStoreServiceTests.java (rev 0)
+++ trunk/joafip-testsuite/src/main/java/net/sf/joafip/kvstore/service/KeyValueStoreServiceTests.java 2012-04-29 20:05:43 UTC (rev 3046)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007 Luc Peuvrier
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sf.joafip.kvstore.service;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import net.sf.joafip.NotStorableClass;
+
+@NotStorableClass
+public class KeyValueStoreServiceTests {
+
+ public static void main(final String[] args) {
+ //
+ }
+
+ public static Test suite() {
+ final TestSuite suite = new TestSuite(
+ "Test for key value store service");
+ // $JUnit-BEGIN$
+ suite.addTestSuite(TestBlockDataManager.class);
+ // suite.addTest(HeapFileServiceTests.suite());
+ // $JUnit-END$
+ return suite;
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
