joafip-svn Mailing List for java data object persistence in file (Page 15)
Brought to you by:
luc_peuvrier
Menu
▾
▴
joafip-svn — svn
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
(102) |
Nov
(52) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(4) |
Feb
|
Mar
(14) |
Apr
(116) |
May
(100) |
Jun
(14) |
Jul
|
Aug
|
Sep
(30) |
Oct
|
Nov
(108) |
Dec
(2) |
|
From: <luc...@us...> - 2012-04-11 03:54:22
|
Revision: 3004
http://joafip.svn.sourceforge.net/joafip/?rev=3004&view=rev
Author: luc_peuvrier
Date: 2012-04-11 03:54:16 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
changes for new babudb tests
Modified Paths:
--------------
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
trunk/joafip-4test/src/main/resources/log4j.properties
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-11 03:54:22
|
Revision: 3004
http://joafip.svn.sourceforge.net/joafip/?rev=3004&view=rev
Author: luc_peuvrier
Date: 2012-04-11 03:54:16 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
changes for new babudb tests
Modified Paths:
--------------
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
trunk/joafip-4test/src/main/resources/log4j.properties
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java
Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java 2012-04-10 03:40:22 UTC (rev 3003)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java 2012-04-11 03:54:16 UTC (rev 3004)
@@ -255,7 +255,7 @@
if( file.isDirectory()) {
deleteDir(file);
} else {
- if( file.delete() ) {
+ if( !file.delete() ) {
throw new FilePersistenceException(FAILED_DELETE+file);
}
}
Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java 2012-04-10 03:40:22 UTC (rev 3003)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java 2012-04-11 03:54:16 UTC (rev 3004)
@@ -39,7 +39,8 @@
private static final JoafipLogger LOGGER = JoafipLogger
.getLogger(InserterJdbm.class);
- public InserterJdbm(final IHeapDataManager dataManager) throws FilePersistenceException,
+ public InserterJdbm(final IHeapDataManager dataManager)
+ throws FilePersistenceException,
FilePersistenceInvalidClassException,
FilePersistenceNotSerializableException,
FilePersistenceClassNotFoundException,
@@ -49,15 +50,14 @@
}
public static void main(final String[] args) {
- /* remove existing data */
- final File dataDirectory = new File(RUNTIME_DIR);
- for (final File file : dataDirectory.listFiles()) {
- file.delete();
- }
- dataDirectory.mkdirs();
- InserterJdbm inserter;
try {
- final JdbmDataManager jdbmDataManager=new JdbmDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+ final File dataDirectory = new File(RUNTIME_DIR);
+ /* remove existing data */
+ initializeDirectory(RUNTIME_DIR);
+ dataDirectory.mkdirs();
+ InserterJdbm inserter;
+ final JdbmDataManager jdbmDataManager = new JdbmDataManager(
+ (new File(dataDirectory, "banana.data")).getAbsolutePath());
inserter = new InserterJdbm(jdbmDataManager);
inserter.run(NUMBER_OF_ITEM);
inserter.close();
Modified: trunk/joafip-4test/src/main/resources/log4j.properties
===================================================================
--- trunk/joafip-4test/src/main/resources/log4j.properties 2012-04-10 03:40:22 UTC (rev 3003)
+++ trunk/joafip-4test/src/main/resources/log4j.properties 2012-04-11 03:54:16 UTC (rev 3004)
@@ -128,6 +128,9 @@
#log4j.logger.net.sf.joafip.service.bug.emis.TestEmis=debug
log4j.logger.net.sf.joafip.performance.items.service.Inserter=info
log4j.logger.net.sf.joafip.performance.items.service.InserterBKM=info
+log4j.logger.net.sf.joafip.performance.items.service.InserterJdbm=info
+log4j.logger.net.sf.joafip.performance.items.service.InserterBabuDB=info
+
log4j.logger.net.sf.joafip.performance.items.service.Searcher=info
log4j.logger.net.sf.joafip.performance.items.service.SearcherBKM=info
log4j.logger.net.sf.joafip.performance.items.service.ImportSearcher=info
Modified: trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java
===================================================================
--- trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java 2012-04-10 03:40:22 UTC (rev 3003)
+++ trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java 2012-04-11 03:54:16 UTC (rev 3004)
@@ -86,6 +86,7 @@
public BabudbDataManager(final String storageFileName) {
super();
this.storageFileName = storageFileName;
+ //Logging.start(Logging.LEVEL_DEBUG);
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-10 03:40:28
|
Revision: 3003
http://joafip.svn.sourceforge.net/joafip/?rev=3003&view=rev
Author: luc_peuvrier
Date: 2012-04-10 03:40:22 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
data manager using babudb library
Added Paths:
-----------
trunk/joafip-babudb/pom.xml
trunk/joafip-babudb/src/
trunk/joafip-babudb/src/main/
trunk/joafip-babudb/src/main/java/
trunk/joafip-babudb/src/main/java/net/
trunk/joafip-babudb/src/main/java/net/sf/
trunk/joafip-babudb/src/main/java/net/sf/joafip/
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/entity/
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java
trunk/joafip-babudb/src/main/resources/
trunk/joafip-babudb/src/test/
trunk/joafip-babudb/src/test/java/
trunk/joafip-babudb/src/test/resources/
Property Changed:
----------------
trunk/joafip-babudb/
Property changes on: trunk/joafip-babudb
___________________________________________________________________
Added: svn:ignore
+ .settings
.classpath
.project
Added: trunk/joafip-babudb/pom.xml
===================================================================
--- trunk/joafip-babudb/pom.xml (rev 0)
+++ trunk/joafip-babudb/pom.xml 2012-04-10 03:40:22 UTC (rev 3003)
@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../joafip-parent</relativePath>
+ </parent>
+ <!-- <groupId>net.sf.joafip</groupId> -->
+ <artifactId>joafip-babudb</artifactId>
+ <packaging>jar</packaging>
+ <version>4.0.0b8</version>
+ <url>http://joafip.sourceforge.net/</url>
+ <name>Joafip storage using babudb</name>
+
+ <!-- <sourceDirectory>src_maven/main/java</sourceDirectory> <testSourceDirectory>src_maven/test/java</testSourceDirectory>
+ <resources><resource><directory>src_maven/main/resource</directory></resource></resources> -->
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.xtreemfs</groupId>
+ <artifactId>babudb</artifactId>
+ <version>0.5.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-common</artifactId>
+ <version>4.0.0b8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-common</artifactId>
+ <version>4.0.0b8</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-kvstore</artifactId>
+ <version>4.0.0b8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-log4j</artifactId>
+ <version>4.0.0b8</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java
===================================================================
--- trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java (rev 0)
+++ trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java 2012-04-10 03:40:22 UTC (rev 3003)
@@ -0,0 +1,454 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * 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
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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.babudb.service;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.service.IDataRecordKeyManager;
+import net.sf.joafip.kvstore.service.AbstractHeapDataManager;
+import net.sf.joafip.kvstore.service.HeapException;
+import net.sf.joafip.logger.JoafipLogger;
+
+import org.xtreemfs.babudb.BabuDBFactory;
+import org.xtreemfs.babudb.api.BabuDB;
+import org.xtreemfs.babudb.api.DatabaseManager;
+import org.xtreemfs.babudb.api.database.Database;
+import org.xtreemfs.babudb.api.exception.BabuDBException;
+import org.xtreemfs.babudb.config.ConfigBuilder;
+
+/**
+ *
+ * @author luc peuvrier
+ *
+ */
+public class BabudbDataManager extends AbstractHeapDataManager {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -9002962642414173846L;
+
+ /** single key on index #0 to store next data record identifier value */
+ private static final byte[] NEXT_ID = "nextId".getBytes();
+
+ /** message */
+ private static final String UNSUPPORTED = "unsupported";
+
+ /** message */
+ private static final String UNKNOWN_NEXT_IDENTIFIER = "unknown next identifier";
+
+ /** logger */
+ private final static JoafipLogger LOGGER = JoafipLogger
+ .getLogger(BabudbDataManager.class);
+
+ /** the database name */
+ private static final String DATA_BASE = "dataBase";
+
+ /** pending modification map */
+ private final Map<Long, byte[]> dataMap = new TreeMap<Long, byte[]>();
+
+ /** storage path */
+ private final String storageFileName;
+
+ private BabuDB databaseSystem;
+
+ private Database database;
+
+ /** next data record identifier value */
+ private long nextIdentifier;
+
+ public BabudbDataManager(final String storageFileName) {
+ super();
+ this.storageFileName = storageFileName;
+ }
+
+ @Override
+ protected void removeFiles() throws HeapException {
+ remove(new File(storageFileName));
+ }
+
+ private void remove(final File file) throws HeapException {
+ if (file.exists()) {
+ if (file.isDirectory()) {
+ for (File subFile : file.listFiles()) {
+ remove(subFile);
+ }
+ } else {
+ if (!file.delete()) {
+ throw new HeapException("failed delete file " + file);
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void startServiceImpl(boolean removeFiles) throws HeapException {
+ try {
+ if (removeFiles) {
+ removeFiles();
+ }
+ ConfigBuilder configBuilder = new ConfigBuilder();
+ configBuilder.setDataPath(storageFileName);
+ databaseSystem = BabuDBFactory.createBabuDB(configBuilder.build());
+ DatabaseManager databaseManager = databaseSystem
+ .getDatabaseManager();
+ if (removeFiles || databaseManager.getDatabases().isEmpty()) {
+ /*
+ * case of remove existing data or database is empty
+ */
+ databaseManager.createDatabase(DATA_BASE, 2/* 2 index */);
+ database = databaseManager.getDatabase(DATA_BASE);
+ // initial value of next data record identifier
+ database.singleInsert(0, NEXT_ID, longToBytes(0), null);
+ nextIdentifier = 0;
+ } else {
+ /*
+ * to works with existing data base
+ */
+ database = databaseManager.getDatabase(DATA_BASE);
+ readNextIdentifier();
+ }
+ } catch (Exception exception) {
+ throw new HeapException(exception);
+ }
+ }
+
+ /**
+ * set {@link #nextIdentifier} from current value in database
+ *
+ * @throws BabuDBException
+ * @throws HeapException
+ */
+ private void readNextIdentifier() throws BabuDBException, HeapException {
+ byte[] bytes = database.lookup(0, NEXT_ID, null).get();
+ if (bytes == null) {
+ throw new HeapException(UNKNOWN_NEXT_IDENTIFIER);
+ }
+ nextIdentifier = bytesToLong(bytes);
+ }
+
+ @Override
+ protected void stopServiceImpl() throws HeapException {
+ try {
+ /*
+ * discard changes, not saved in database
+ */
+ dataMap.clear();
+ // create a checkpoint for faster start-ups
+ databaseSystem.getCheckpointer().checkpoint();
+ databaseSystem.shutdown();
+ } catch (Exception exception) {
+ throw new HeapException(exception);
+ }
+ }
+
+ @Override
+ protected void closeHeapManagerAfterException() {
+ // close all after error
+ try {
+ databaseSystem.shutdown();
+ } catch (Exception exception) {
+ // ignore error, only a log for information
+ LOGGER.error("closing after error", exception);
+ }
+ }
+
+ @Override
+ public boolean isDataLost() {
+ // can not check if data lost, assume database is consistent
+ return false;
+ }
+
+ @Override
+ public String getStorageFileName() throws HeapException {
+ return storageFileName;
+ }
+
+ @Override
+ public String getBackupFileName() throws HeapException {
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ public String getChangeFileName() throws HeapException {
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ protected void clearImpl() throws HeapException {
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ protected void flushImp() throws HeapException {
+ try {
+ /*
+ * all changes in dataMap are inserted in database
+ */
+ // DatabaseInsertGroup group = database.createInsertGroup();
+ for (Map.Entry<Long, byte[]> entry : dataMap.entrySet()) {
+ // group.addInsert(1, longToBytes(entry.getKey()),
+ // entry.getValue());
+ database.singleInsert(1, longToBytes(entry.getKey()),
+ entry.getValue(), null);
+ }
+ dataMap.clear();
+ /*
+ * update next data record identifier in database
+ */
+ // group.addInsert(0, NEXT_ID, longToBytes(nextIdentifier));
+ database.singleInsert(0, NEXT_ID, longToBytes(nextIdentifier), null);
+ // database.insert(group, null).get();
+ } catch (Exception exception) {
+ throw new HeapException(exception);
+ }
+ }
+
+ @Override
+ protected void clearStandbyModificationImpl() throws HeapException {
+ try {
+ /*
+ * discard all changes
+ */
+ dataMap.clear();
+ readNextIdentifier();
+ } catch (Exception exception) {
+ throw new HeapException(exception);
+ }
+ }
+
+ @Override
+ protected DataRecordIdentifier getNextFreeDataRecordIdentifierImpl()
+ throws HeapException {
+ return new DataRecordIdentifier(nextIdentifier);
+ }
+
+ @Override
+ protected void setNextFreeDataRecordIdentifierImpl(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ nextIdentifier = dataRecordIdentifier.value;
+ }
+
+ @Override
+ protected DataRecordIdentifier getNewDataRecordIdentifierImpl()
+ throws HeapException {
+ return new DataRecordIdentifier(nextIdentifier++);
+ }
+
+ @Override
+ protected boolean deleteDataRecordImpl(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ try {
+ // deleted if exist in database or in pending modification map
+ boolean deleted;
+ byte[] bytes = database.lookup(1,
+ longToBytes(dataRecordIdentifier.value), null).get();
+ deleted = bytes != null;
+ deleted |= dataMap.put(dataRecordIdentifier.value, null) != null;
+ return deleted;
+ } catch (Exception exception) {
+ throw new HeapException(exception);
+ }
+ }
+
+ @Override
+ protected byte[] readDataRecordImpl(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ try {
+ /*
+ * first search in pending modification map, and then if not in
+ * pending modification map search in database
+ */
+ byte[] data = dataMap.get(dataRecordIdentifier.value);
+ if (data == null) {
+ data = database.lookup(1,
+ longToBytes(dataRecordIdentifier.value), null).get();
+ }
+ return data;
+ } catch (Exception exception) {
+ throw new HeapException(exception);
+ }
+ }
+
+ @Override
+ protected boolean writeDataRecordImpl(
+ final DataRecordIdentifier dataRecordIdentifier, byte[] data)
+ throws HeapException {
+ try {
+ // created if not exist in database nor in pending modification map
+ boolean created = !dataMap.containsKey(dataRecordIdentifier.value)
+ && database.lookup(1,
+ longToBytes(dataRecordIdentifier.value), null)
+ .get() != null;
+ // add to pending modification map
+ dataMap.put(dataRecordIdentifier.value, data);
+ return created;
+ } catch (Exception exception) {
+ throw new HeapException(exception);
+ }
+ }
+
+ @Override
+ protected boolean hasDataRecordImpl(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ try {
+ /*
+ * first search in pending modification map, and then if not in
+ * pending modification map search in database
+ */
+ return dataMap.containsKey(dataRecordIdentifier.value)
+ || database.lookup(1,
+ longToBytes(dataRecordIdentifier.value), null)
+ .get() != null;
+ } catch (Exception exception) {
+ throw new HeapException(exception);
+ }
+ }
+
+ @Override
+ protected int getNumberOfDataRecordImpl() throws HeapException {
+ // TODO how to count number of indexes #1 in database ?
+ return 0;
+ }
+
+ @Override
+ protected int getNumberOfFreeRecordImpl() throws HeapException {
+ // TODO no free records with babudb ?
+ return 0;
+ }
+
+ @Override
+ protected long heapSizeImpl() throws HeapException {
+ // TODO all babudb files used size sum ?
+ return 0;
+ }
+
+ @Override
+ protected long freeSizeImpl() throws HeapException {
+ // TODO is there free area in files used by babudb ?
+ return 0;
+ }
+
+ @Override
+ protected long usedSizeImpl() throws HeapException {
+ // TODO see free size
+ return 0;
+ }
+
+ @Override
+ protected DataRecordIdentifier removeFirstDataRecordImpl()
+ throws HeapException {
+ // not needed for basic usage
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ protected Set<DataRecordIdentifier> getDataRecordIdentifierSetImpl()
+ throws HeapException {
+ // not needed for basic usage
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ protected Iterator<DataRecordIdentifier> dataRecordIteratorImpl()
+ throws HeapException {
+ // not needed for basic usage
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ public void backup(long identifier, int maxBackup) throws HeapException {
+ // not needed for basic usage
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ public long getRecordPositionInfile(DataRecordIdentifier identifier)
+ throws HeapException {
+ // no meaning with babudb
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ public long getLastRecordPositionInFile() throws HeapException {
+ // no meaning with babudb
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ @Override
+ public void setDataRecordKeyComparator(
+ IDataRecordKeyManager dataRecordKeyComparator) throws HeapException {
+ // only data record identifier value used as key
+ throw new HeapException(UNSUPPORTED);
+ }
+
+ /**
+ * Unmarshal bytes to long value
+ *
+ * @param bytes
+ * the serialized form
+ * @return the long value
+ */
+ private long bytesToLong(final byte[] bytes) {
+ long longValue = 0;
+ longValue |= ((((long) bytes[0]) & 0xff) << 56);
+ longValue |= ((((long) bytes[1]) & 0xff) << 48);
+ longValue |= ((((long) bytes[2]) & 0xff) << 40);
+ longValue |= ((((long) bytes[3]) & 0xff) << 32);
+ longValue |= ((((long) bytes[4]) & 0xff) << 24);
+ longValue |= ((((long) bytes[5]) & 0xff) << 16);
+ longValue |= ((((long) bytes[6]) & 0xff) << 8);
+ longValue |= (((long) bytes[7]) & 0xff) & 0xff;
+ return longValue;
+ }
+
+ /**
+ * marshal a long value to bytes
+ *
+ * @param value
+ * the value
+ * @return the serialized form
+ */
+ private byte[] longToBytes(final long value) {
+ final byte[] binary = new byte[8];
+ binary[0] = (byte) (value >> 56);
+ binary[1] = (byte) (value >> 48);
+ binary[2] = (byte) (value >> 40);
+ binary[3] = (byte) (value >> 32);
+ binary[4] = (byte) (value >> 24);
+ binary[5] = (byte) (value >> 16);
+ binary[6] = (byte) (value >> 8);
+ binary[7] = (byte) value;
+ return binary;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-10 03:40:28
|
Revision: 3003
http://joafip.svn.sourceforge.net/joafip/?rev=3003&view=rev
Author: luc_peuvrier
Date: 2012-04-10 03:40:22 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
data manager using babudb library
Added Paths:
-----------
trunk/joafip-babudb/pom.xml
trunk/joafip-babudb/src/
trunk/joafip-babudb/src/main/
trunk/joafip-babudb/src/main/java/
trunk/joafip-babudb/src/main/java/net/
trunk/joafip-babudb/src/main/java/net/sf/
trunk/joafip-babudb/src/main/java/net/sf/joafip/
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/entity/
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/
trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java
trunk/joafip-babudb/src/main/resources/
trunk/joafip-babudb/src/test/
trunk/joafip-babudb/src/test/java/
trunk/joafip-babudb/src/test/resources/
Property Changed:
----------------
trunk/joafip-babudb/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-10 03:37:21
|
Revision: 3002
http://joafip.svn.sourceforge.net/joafip/?rev=3002&view=rev
Author: luc_peuvrier
Date: 2012-04-10 03:37:15 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Initial import.
Added Paths:
-----------
trunk/joafip-babudb/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-10 03:37:21
|
Revision: 3002
http://joafip.svn.sourceforge.net/joafip/?rev=3002&view=rev
Author: luc_peuvrier
Date: 2012-04-10 03:37:15 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Initial import.
Added Paths:
-----------
trunk/joafip-babudb/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-10 03:02:53
|
Revision: 3001
http://joafip.svn.sourceforge.net/joafip/?rev=3001&view=rev
Author: luc_peuvrier
Date: 2012-04-10 03:02:47 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
new tests with babudb library
Modified Paths:
--------------
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java 2012-04-10 01:24:27 UTC (rev 3000)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java 2012-04-10 03:02:47 UTC (rev 3001)
@@ -42,6 +42,8 @@
@StorableAccess
public class AbstractPerfService {
+ private static final String FAILED_DELETE = "failed delete ";
+
protected final JoafipLogger logger = JoafipLogger.getLogger(getClass());// NOPMD
protected static final String RUNTIME_DIR = "runtime_perf";
@@ -227,4 +229,39 @@
}
byItemIndex = 0;
}
+
+ protected static void initializeDirectory(final String rootDir) throws FilePersistenceException {
+ initializeDirectory(new File(rootDir));
+ }
+
+ protected static void initializeDirectory(final File rootDir) throws FilePersistenceException {
+ if( rootDir.exists()) {
+ if( rootDir.isDirectory()) {
+ deleteDir(rootDir);
+ } else {
+ if( !rootDir.delete() ) {
+ throw new FilePersistenceException(FAILED_DELETE+rootDir);
+ }
+ }
+ }
+ if( !rootDir.mkdirs()) {
+ throw new FilePersistenceException("failed create "+rootDir);
+ }
+ }
+
+ private static void deleteDir(final File dir) throws FilePersistenceException {
+ final File[] files = dir.listFiles();
+ for(File file:files) {
+ if( file.isDirectory()) {
+ deleteDir(file);
+ } else {
+ if( file.delete() ) {
+ throw new FilePersistenceException(FAILED_DELETE+file);
+ }
+ }
+ }
+ if( !dir.delete() ) {
+ throw new FilePersistenceException(FAILED_DELETE+dir);
+ }
+ }
}
Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java 2012-04-10 01:24:27 UTC (rev 3000)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java 2012-04-10 03:02:47 UTC (rev 3001)
@@ -39,7 +39,8 @@
private static final JoafipLogger LOGGER = JoafipLogger
.getLogger(InserterBabuDB.class);
- public InserterBabuDB(final IHeapDataManager dataManager) throws FilePersistenceException,
+ public InserterBabuDB(final IHeapDataManager dataManager)
+ throws FilePersistenceException,
FilePersistenceInvalidClassException,
FilePersistenceNotSerializableException,
FilePersistenceClassNotFoundException,
@@ -49,15 +50,13 @@
}
public static void main(final String[] args) {
- /* remove existing data */
- final File dataDirectory = new File(RUNTIME_DIR);
- for (final File file : dataDirectory.listFiles()) {
- file.delete();
- }
- dataDirectory.mkdirs();
- InserterBabuDB inserter;
try {
- final BabudbDataManager babudbDataManager=new BabudbDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+ /* remove existing data */
+ initializeDirectory(RUNTIME_DIR);
+ final File dataDirectory = new File(RUNTIME_DIR);
+ InserterBabuDB inserter;
+ final BabudbDataManager babudbDataManager = new BabudbDataManager(
+ (new File(dataDirectory, "banana.data")).getAbsolutePath());
inserter = new InserterBabuDB(babudbDataManager);
inserter.run(NUMBER_OF_ITEM);
inserter.close();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-10 03:02:53
|
Revision: 3001
http://joafip.svn.sourceforge.net/joafip/?rev=3001&view=rev
Author: luc_peuvrier
Date: 2012-04-10 03:02:47 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
new tests with babudb library
Modified Paths:
--------------
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-10 01:24:34
|
Revision: 3000
http://joafip.svn.sourceforge.net/joafip/?rev=3000&view=rev
Author: luc_peuvrier
Date: 2012-04-10 01:24:27 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
data manager using babudb library
Modified Paths:
--------------
trunk/joafip-4test/pom.xml
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java
trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java
trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
trunk/joafip-parent/pom.xml
Added Paths:
-----------
trunk/joafip-4test/src/main/java/net/sf/joafip/logger/
trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
trunk/joafip-4test/src/main/resources/log4j.properties
trunk/joafip-4test/src/test/java/net/
trunk/joafip-4test/src/test/java/net/sf/
trunk/joafip-4test/src/test/java/net/sf/joafip/
trunk/joafip-4test/src/test/java/net/sf/joafip/logger/
trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-10 01:24:34
|
Revision: 3000
http://joafip.svn.sourceforge.net/joafip/?rev=3000&view=rev
Author: luc_peuvrier
Date: 2012-04-10 01:24:27 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
data manager using babudb library
Modified Paths:
--------------
trunk/joafip-4test/pom.xml
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java
trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java
trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
trunk/joafip-parent/pom.xml
Added Paths:
-----------
trunk/joafip-4test/src/main/java/net/sf/joafip/logger/
trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
trunk/joafip-4test/src/main/resources/log4j.properties
trunk/joafip-4test/src/test/java/net/
trunk/joafip-4test/src/test/java/net/sf/
trunk/joafip-4test/src/test/java/net/sf/joafip/
trunk/joafip-4test/src/test/java/net/sf/joafip/logger/
trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
Modified: trunk/joafip-4test/pom.xml
===================================================================
--- trunk/joafip-4test/pom.xml 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-4test/pom.xml 2012-04-10 01:24:27 UTC (rev 3000)
@@ -57,6 +57,12 @@
<dependency>
<groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-babudb</artifactId>
+ <version>4.0.0b8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
<artifactId>joafip-rbtree</artifactId>
<version>4.0.0b8</version>
</dependency>
@@ -89,7 +95,6 @@
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-log4j</artifactId>
<version>4.0.0b8</version>
- <scope>test</scope>
</dependency>
</dependencies>
Added: trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java (rev 0)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * 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
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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.logger;
+
+public class MainTestLogger {
+
+ public static void main(final String[] args) {
+ final JoafipLogger logger=JoafipLogger.getLogger(MainTestLogger.class);
+ logger.fatal("fatal error message");
+ }
+}
Added: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java (rev 0)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -0,0 +1,68 @@
+/*
+ * 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.performance.items.service;//NOPMD
+
+import java.io.File;
+
+import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
+import net.sf.joafip.babudb.service.BabudbDataManager;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
+import net.sf.joafip.logger.JoafipLogger;
+import net.sf.joafip.service.FilePersistenceClassNotFoundException;
+import net.sf.joafip.service.FilePersistenceDataCorruptedException;
+import net.sf.joafip.service.FilePersistenceException;
+import net.sf.joafip.service.FilePersistenceInvalidClassException;
+import net.sf.joafip.service.FilePersistenceNotSerializableException;
+import net.sf.joafip.service.FilePersistenceTooBigForSerializationException;
+import net.sf.joafip.store.service.StoreClassNotFoundException;
+
+@SuppressWarnings("PMD")
+@NotStorableClass
+@StorableAccess
+public class InserterBabuDB extends AbstractInserter {
+
+ private static final JoafipLogger LOGGER = JoafipLogger
+ .getLogger(InserterBabuDB.class);
+
+ public InserterBabuDB(final IHeapDataManager dataManager) throws FilePersistenceException,
+ FilePersistenceInvalidClassException,
+ FilePersistenceNotSerializableException,
+ FilePersistenceClassNotFoundException,
+ FilePersistenceDataCorruptedException, StoreClassNotFoundException,
+ FilePersistenceTooBigForSerializationException {
+ super(dataManager);
+ }
+
+ public static void main(final String[] args) {
+ /* remove existing data */
+ final File dataDirectory = new File(RUNTIME_DIR);
+ for (final File file : dataDirectory.listFiles()) {
+ file.delete();
+ }
+ dataDirectory.mkdirs();
+ InserterBabuDB inserter;
+ try {
+ final BabudbDataManager babudbDataManager=new BabudbDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+ inserter = new InserterBabuDB(babudbDataManager);
+ inserter.run(NUMBER_OF_ITEM);
+ inserter.close();
+ } catch (final Throwable throwable) {// NOPMD catch all
+ LOGGER.fatal("error", throwable);
+ }
+ }
+}
Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -57,8 +57,8 @@
dataDirectory.mkdirs();
InserterJdbm inserter;
try {
- final JdbmDataManager bananaDataManager=new JdbmDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
- inserter = new InserterJdbm(bananaDataManager);
+ final JdbmDataManager jdbmDataManager=new JdbmDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+ inserter = new InserterJdbm(jdbmDataManager);
inserter.run(NUMBER_OF_ITEM);
inserter.close();
} catch (final Throwable throwable) {// NOPMD catch all
Added: trunk/joafip-4test/src/main/resources/log4j.properties
===================================================================
--- trunk/joafip-4test/src/main/resources/log4j.properties (rev 0)
+++ trunk/joafip-4test/src/main/resources/log4j.properties 2012-04-10 01:24:27 UTC (rev 3000)
@@ -0,0 +1,148 @@
+
+
+log4j.rootLogger=WARN,CONSOLE,FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.CONSOLE.layout.conversionPattern=[%p,%c{1},%t] %m%n
+#log4j.appender.CONSOLE.layout.ConversionPattern=[%5p] - %d [%t] %c (%F:%M:%L) %n %m%n%n
+log4j.appender.CONSOLE.layout.ConversionPattern=[%5p] - %d [%t] (%c.java:%M:%L) %n %m%n%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+#log4j.appender.FILE.File=${webapp.root}/WEB-INF/log4j.log
+log4j.appender.FILE.File=logs/joafip.log
+log4j.appender.FILE.MaxFileSize=1024KB
+log4j.appender.FILE.MaxBackupIndex=3
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.FILE.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n
+log4j.appender.FILE.layout.ConversionPattern=[%5p] - %d [%t] (%c.java:%M:%L) %n %m%n%n
+
+log4j.logger.net.sf.joafip=warn
+log4j.logger.net.sf.joafip.HelperMemoryUse=info
+log4j.logger.net.sf.joafip.meminspector=warn
+log4j.logger.net.sf.joafip.java.util=warn
+
+#log4j.logger.net.sf.joafip.btree=debug
+
+#log4j.logger.net.sf.joafip.file.service.RandomAccessFileReadWriteCache=debug
+#log4j.logger.net.sf.joafip.file.service.RandomAccessFileDirectNio=debug
+
+#log4j.logger.net.sf.joafip.heapfile.record.service=debug
+#log4j.logger.net.sf.joafip.heapfile.record.service.HeapElementManager=debug
+#log4j.logger.HeapElementManager=debug
+
+#log4j.logger.net.sf.joafip.heapfile.service.HeapFileDataManager=debug
+
+#log4j.logger.HeapFileDataManager=debug
+#log4j.logger.net.sf.joafip.heapfile.service.HeapMemoryDataManagerMock=debug
+
+#log4j.logger.net.sf.joafip.store.entity.objectio.ObjectStateMap=debug
+
+#log4j.logger.net.sf.joafip.store.entity.saver.StoreSaverSession=debug
+#log4j.logger.net.sf.joafip.store.entity.conversion.ReplacementDefSet=debug
+#log4j.logger.net.sf.joafip.store.entity.conversion.ReplacementDefMap=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.LinkManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.recordmgr.LinkRecordManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.GarbageRecordManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.GarbageManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.StoreGarbager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.AttachedToRootSupport=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.GarbageManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.rbt.ToGarbageRBTNodeManager=debug
+#log4j.logger.net.sf.joafip.store.service.Store=debug
+#log4j.logger.net.sf.joafip.store.service.StoreRemover=debug
+#log4j.logger.net.sf.joafip.store.service.saver.StoreSaver3=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.manager.ObjectIOManager=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.manager.ClassNameManager=debug
+#log4j.logger.net.sf.joafip.store.service.export_import.in.InObjectHandler=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOLazyGeneric=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOArray=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOBasic=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIODummy=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOEnum=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOImmediateExternalizable=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOImmediateGeneric=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOImmediateSerializable=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOInputStream=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOLazyExternalizable=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOLazyGeneric=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOLazySerializable=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOOutputStream=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOSerialize=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOSerializeGZipped=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOSerializeZipped=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOString=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ReferenceIO=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.BasicOrReferenceIO=debug
+
+#log4j.logger.net.sf.joafip.store.service.heaprecordable.HeapRecordableManager=debug
+#log4j.logger.net.sf.joafip.store.service.objectfortest.Bob1=debug
+#log4j.logger.net.sf.joafip.store.service.proxy=debug
+#log4j.logger.net.sf.joafip.store.service.proxy.ClassEnhancer=debug
+#log4j.logger.net.sf.joafip.store.service.proxy.ProxyCallBack2=debug
+#log4j.logger.net.sf.joafip.store.service.export_import.in.XmlImporter=debug
+#log4j.logger.net.sf.joafip.store.service.conversion.ConversionManager=debug
+# set log4j.logger.net.sf.joafip.store.service.bytecode.ClassEnhancer=debug
+# -------- will output bytecode in runtime/class
+#log4j.logger.net.sf.joafip.store.service.bytecode.ClassEnhancer=debug
+
+#--- tests ---
+log4j.logger.net.sf.joafip.entity.BobForExport=debug
+#log4j.logger.net.sf.joafip.heapfile.record.service.TestHeapElementManager=debug
+#log4j.logger.net.sf.joafip.heapfile.service.TestHeapDataManager=debug
+#log4j.logger.net.sf.joafip.store.service.TestGarbage=debug
+#log4j.logger.net.sf.joafip.heapfile.record.service.TestHeapRecordManage=debug
+#log4j.logger.net.sf.joafip.service.changelog.CheckSaved=debug
+#log4j.logger.net.sf.joafip.service.bug.TestGarbageModeError=info
+#log4j.logger.net.sf.joafip.service.TestCrashSafe=debug
+#log4j.logger.net.sf.joafip.service.TestMultiAccessFilePersistence=debug
+#log4j.logger.net.sf.joafip.service.bug.savenum.TestEnumPersistence=debug
+#log4j.logger.net.sf.joafip.service.bug.savenum.TestEnumPersistenceMemory=debug
+log4j.logger.net.sf.joafip.service.rel400.TestHugeList=debug
+log4j.logger.net.sf.joafip.service.rel400.TestHugeListAutoSave=debug
+#log4j.logger.net.sf.joafip.service.rel400.MemoryEater=debug
+#log4j.logger.net.sf.joafip.store.service.TestGarbageForegroundFile=debug
+#log4j.logger.net.sf.joafip.store.service.TestGarbageForegroundMemory=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobFileLazy=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobFileDirect=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobFileLazyNoGarbage=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobMemoryDirect=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobMemoryLazy=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreSession=debug
+#log4j.logger.net.sf.joafip.service.TestVisitedModified=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreNoG=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithG=debug
+#log4j.logger.net.sf.joafip.ograph.ObjectGraphCreator=debug
+#log4j.logger.net.sf.joafip.store.service.classinfo.TestClassReplacement=debug
+#log4j.logger.net.sf.joafip.store.service.TestLinkManagementInMemory=debug
+#log4j.logger.net.sf.joafip.heapfile.service.HeapMemoryDataManagerMock=debug
+#log4j.logger.net.sf.joafip.meminspector.MemInspectorTest=debug
+#log4j.logger.net.sf.joafip.file.service.RandomAccessFileReadWriteCacheTest=debug
+#log4j.logger.net.sf.joafip.store.service.TestVisitedModified=debug
+#log4j.logger.net.sf.joafip.ograph.OGraphTest=debug
+log4j.logger.net.sf.joafip.store.service.proxy.TestCheckMethodVisitor=debug
+#--- no auto tests ---
+#log4j.logger.net.sf.joafip.performance.service=debug
+#log4j.logger.net.sf.joafip.service.bug.emis.TestEmis=debug
+log4j.logger.net.sf.joafip.performance.items.service.Inserter=info
+log4j.logger.net.sf.joafip.performance.items.service.InserterBKM=info
+log4j.logger.net.sf.joafip.performance.items.service.Searcher=info
+log4j.logger.net.sf.joafip.performance.items.service.SearcherBKM=info
+log4j.logger.net.sf.joafip.performance.items.service.ImportSearcher=info
+log4j.logger.net.sf.joafip.service.MainCrash=info
+log4j.logger.net.sf.joafip.service.MainAfterCrash=info
+log4j.logger.net.sf.joafip.service.MainWarnDataRecord1=debug
+
+#--- java agent ---
+#log4j.logger.net.sf.joafip.store.service.bytecode.PersistableTransformer=debug
+#log4j.logger.net.sf.joafip.store.service.bytecode.PersistableCodeGenerator=debug
+#log4j.logger.net.sf.joafip.service.JoafipJavaAgent=debug
+log4j.logger.net.sf.joafip.store.service.bytecode.ClassVisitorForStorable=debug
+#--- sample ---
+log4j.logger.net.sf.joafip.database.MainDatabase=info
+#--- meminspector ---
+log4j.logger.net.sf.joafip.meminspector.entity.NodeForObject=warn
+log4j.logger.net.sf.joafip.meminspector.service.show.JTreeForNodeForObject=info
+
Added: trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
===================================================================
--- trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java (rev 0)
+++ trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * 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
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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.logger;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ * @author luc peuvrier
+ *
+ */
+public class TestCreateLogger extends TestCase {
+
+ public void test() {
+ final JoafipLogger logger=JoafipLogger.getLogger(TestCreateLogger.class);
+ logger.fatal("fatal error message");
+ assertTrue("logger must be set",logger.loggerIsSet());
+ }
+}
Modified: trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
===================================================================
--- trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -101,6 +101,10 @@
this.infoEnabled = infoEnabled;
}
+ public boolean loggerIsSet() {
+ return !(loggerFactory instanceof DummyLoggerFactory);
+ }
+
public boolean isDebugEnabled() {
return debugEnabled;
}
Modified: trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java
===================================================================
--- trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -49,6 +49,8 @@
*/
private static final long serialVersionUID = 8469844004206234652L;
+ private static final String UNSUPPORTED = "unsupported";
+
private static final String UNKNOWN_NEXT_IDENTIFIER = "unknown next identifier";
private static final String ID_KEY = "idKey";
@@ -56,8 +58,6 @@
private static final JoafipLogger LOGGER = JoafipLogger
.getLogger(JdbmDataManager.class);
- private static final String UNSUPPORTED = "unsupported";
-
private final String storageFileName;
private RecordManager recordManager;
Modified: trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java
===================================================================
--- trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -65,6 +65,7 @@
this.logger = logger;
}
+ @SuppressWarnings("PMD")
private void assertForcedLogMethodIsSet() {
if (forcedLogMethod == null) {
throw new RuntimeException(
@@ -80,13 +81,15 @@
@Override
public void debug(final Object message) {
// logger.debug(message);
- if (logger.getLoggerRepository().isDisabled(Level.DEBUG_INT))
+ if (logger.getLoggerRepository().isDisabled(Level.DEBUG_INT)) {
return;
+ }
if (Level.DEBUG.isGreaterOrEqual(logger.getEffectiveLevel())) {
forcedLog(FQCN, Level.DEBUG, message, null);
}
}
+ @SuppressWarnings("PMD")
private void forcedLog(final String fqcn, final Priority level,
final Object message, final Throwable throwable) {
assertForcedLogMethodIsSet();
@@ -104,10 +107,12 @@
@Override
public void debug(final Object message, final Throwable throwable) {
// logger.debug(message, throwable);
- if (logger.getLoggerRepository().isDisabled(Level.DEBUG_INT))
+ if (logger.getLoggerRepository().isDisabled(Level.DEBUG_INT)) {
return;
- if (Level.DEBUG.isGreaterOrEqual(logger.getEffectiveLevel()))
+ }
+ if (Level.DEBUG.isGreaterOrEqual(logger.getEffectiveLevel())) {
forcedLog(FQCN, Level.DEBUG, message, throwable);
+ }
}
@Override
Modified: trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
===================================================================
--- trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -33,7 +33,8 @@
public class TestCreateLogger extends TestCase {
public void test() {
- JoafipLogger logger=JoafipLogger.getLogger(TestCreateLogger.class);
+ final JoafipLogger logger=JoafipLogger.getLogger(TestCreateLogger.class);
logger.fatal("fatal error message");
+ assertTrue("logger must be set",logger.loggerIsSet());
}
}
Modified: trunk/joafip-parent/pom.xml
===================================================================
--- trunk/joafip-parent/pom.xml 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-parent/pom.xml 2012-04-10 01:24:27 UTC (rev 3000)
@@ -351,6 +351,7 @@
<module>../joafip-kvstore</module>
<module>../joafip-heapfile</module>
<module>../joafip-jdbm</module>
+ <module>../joafip-babudb</module>
<module>../joafip-pmap</module>
<module>../joafip-callback</module>
<module>../joafip-java-agent</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-09 05:41:34
|
Revision: 2999
http://joafip.svn.sourceforge.net/joafip/?rev=2999&view=rev
Author: luc_peuvrier
Date: 2012-04-09 05:41:25 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
data manager using jdbm library
Modified Paths:
--------------
trunk/joafip-4test/pom.xml
trunk/joafip-common/src/main/java/net/sf/joafip/logger/DummyLogger.java
trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/IHeapDataManager.java
trunk/joafip-parent/pom.xml
Added Paths:
-----------
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
trunk/joafip-jdbm/.classpath
trunk/joafip-jdbm/.pmd
trunk/joafip-jdbm/.project
trunk/joafip-jdbm/.ruleset
trunk/joafip-jdbm/.settings/
trunk/joafip-jdbm/.settings/org.eclipse.core.resources.prefs
trunk/joafip-jdbm/.settings/org.eclipse.jdt.core.prefs
trunk/joafip-jdbm/.settings/org.eclipse.m2e.core.prefs
trunk/joafip-jdbm/pom.xml
trunk/joafip-jdbm/src/
trunk/joafip-jdbm/src/main/
trunk/joafip-jdbm/src/main/java/
trunk/joafip-jdbm/src/main/java/net/
trunk/joafip-jdbm/src/main/java/net/sf/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/entity/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java
trunk/joafip-jdbm/src/main/resources/
trunk/joafip-jdbm/src/test/
trunk/joafip-jdbm/src/test/java/
trunk/joafip-jdbm/src/test/resources/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/AbstractHeapDataManager.java
trunk/joafip-log4j/src/test/java/net/
trunk/joafip-log4j/src/test/java/net/sf/
trunk/joafip-log4j/src/test/java/net/sf/joafip/
trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/
trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
Removed Paths:
-------------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java
Modified: trunk/joafip-4test/pom.xml
===================================================================
--- trunk/joafip-4test/pom.xml 2012-04-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-4test/pom.xml 2012-04-09 05:41:25 UTC (rev 2999)
@@ -51,6 +51,12 @@
<dependency>
<groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-jdbm</artifactId>
+ <version>4.0.0b8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
<artifactId>joafip-rbtree</artifactId>
<version>4.0.0b8</version>
</dependency>
Added: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java (rev 0)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,68 @@
+/*
+ * 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.performance.items.service;//NOPMD
+
+import java.io.File;
+
+import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
+import net.sf.joafip.jdbm.service.JdbmDataManager;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
+import net.sf.joafip.logger.JoafipLogger;
+import net.sf.joafip.service.FilePersistenceClassNotFoundException;
+import net.sf.joafip.service.FilePersistenceDataCorruptedException;
+import net.sf.joafip.service.FilePersistenceException;
+import net.sf.joafip.service.FilePersistenceInvalidClassException;
+import net.sf.joafip.service.FilePersistenceNotSerializableException;
+import net.sf.joafip.service.FilePersistenceTooBigForSerializationException;
+import net.sf.joafip.store.service.StoreClassNotFoundException;
+
+@SuppressWarnings("PMD")
+@NotStorableClass
+@StorableAccess
+public class InserterJdbm extends AbstractInserter {
+
+ private static final JoafipLogger LOGGER = JoafipLogger
+ .getLogger(InserterJdbm.class);
+
+ public InserterJdbm(final IHeapDataManager dataManager) throws FilePersistenceException,
+ FilePersistenceInvalidClassException,
+ FilePersistenceNotSerializableException,
+ FilePersistenceClassNotFoundException,
+ FilePersistenceDataCorruptedException, StoreClassNotFoundException,
+ FilePersistenceTooBigForSerializationException {
+ super(dataManager);
+ }
+
+ public static void main(final String[] args) {
+ /* remove existing data */
+ final File dataDirectory = new File(RUNTIME_DIR);
+ for (final File file : dataDirectory.listFiles()) {
+ file.delete();
+ }
+ dataDirectory.mkdirs();
+ InserterJdbm inserter;
+ try {
+ final JdbmDataManager bananaDataManager=new JdbmDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+ inserter = new InserterJdbm(bananaDataManager);
+ inserter.run(NUMBER_OF_ITEM);
+ inserter.close();
+ } catch (final Throwable throwable) {// NOPMD catch all
+ LOGGER.fatal("error", throwable);
+ }
+ }
+}
Modified: trunk/joafip-common/src/main/java/net/sf/joafip/logger/DummyLogger.java
===================================================================
--- trunk/joafip-common/src/main/java/net/sf/joafip/logger/DummyLogger.java 2012-04-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-common/src/main/java/net/sf/joafip/logger/DummyLogger.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -27,66 +27,73 @@
* @author luc peuvrier
*
*/
+@SuppressWarnings("PMD")
public class DummyLogger implements IJoafipLogger {
@Override
public void debug(final Object message) {
- // no implementation
+ System.err.println("debug: "+message);
}
@Override
public void debug(final Object message, final Throwable throwable) {
- // no implementation
+ System.err.println("debug: "+message);
+ throwable.printStackTrace();
}
@Override
public void trace(final Object message) {
- // no implementation
+ System.err.println("trace: "+message);
}
@Override
public void trace(final Object message, final Throwable throwable) {
- // no implementation
+ System.err.println("trace: "+message);
+ throwable.printStackTrace();
}
@Override
public void info(final Object message) {
- // no implementation
+ System.err.println("info: "+message);
}
@Override
public void info(final Object message, final Throwable throwable) {
- // no implementation
+ System.err.println("info: "+message);
+ throwable.printStackTrace();
}
@Override
public void warn(final Object message) {
- // no implementation
+ System.err.println("warn: "+message);
}
@Override
public void warn(final Object message, final Throwable throwable) {
- // no implementation
+ System.err.println("warn: "+message);
+ throwable.printStackTrace();
}
@Override
public void error(final Object message) {
- // no implementation
+ System.err.println("error: "+message);
}
@Override
public void error(final Object message, final Throwable throwable) {
- // no implementation
+ System.err.println("error: "+message);
+ throwable.printStackTrace();
}
@Override
public void fatal(final Object message) {
- // no implementation
+ System.err.println("fatal: "+message);
}
@Override
public void fatal(final Object message, final Throwable throwable) {
- // no implementation
+ System.err.println("fatal: "+message);
+ throwable.printStackTrace();
}
@Override
Modified: trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
===================================================================
--- trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java 2012-04-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -65,8 +65,9 @@
}
if (inStream == null) {
System.err.println(// NOPMD
- /**/"failed to find " + JOAFIP_LOGGER_PROPERTIES
- + " resource");
+ /**/JoafipLogger.class.getName()
+ + ": failed to find "
+ + JOAFIP_LOGGER_PROPERTIES + " resource");
loggerFactory = new DummyLoggerFactory();
} else {
final Properties properties = new Properties();
Deleted: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java 2012-04-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -1,701 +0,0 @@
-/*
- * Copyright 2008 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 java.io.Serializable;
-import java.util.Iterator;
-import java.util.Set;
-
-import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
-import net.sf.joafip.kvstore.service.HeapException;
-import net.sf.joafip.kvstore.service.IHeapDataManager;
-import net.sf.joafip.logger.JoafipLogger;
-
-/**
- *
- * @author luc peuvrier
- *
- */
-@NotStorableClass
-public abstract class AbstractHeapDataManager implements IHeapDataManager,
- Serializable {
-
- private static final String UNSUPPORTED_OPERATION = "unsupported operation";
-
- /**
- *
- */
- private static final long serialVersionUID = -2448517084972656682L;
-
- protected final JoafipLogger logger = JoafipLogger.getLogger(getClass());// NOPMD
-
- private static final String DATA_MANAGER_NOT_OPENED =
- /**/"data manager not opened";
-
- private static final String DATA_MANAGER_ALREADY_OPENED =
- /**/"data manager already opened";
-
- protected static final String FLUSH_FAILED =
- /**/"flush failed";
-
- protected static final String FAILED_READ_DATA_RECORD =
- /**/"failed read data record for identifier ";
-
- protected static final String CLEAR_STANDBY_MODIFICATION_FAILED =
- /**/"clear standby modification failed";
-
- /** true when this is service started state */
- private boolean started = false;
-
- private Exception stopperStackTrace = new Exception("stopper stack trace");// NOPMD
-
- private Exception starterStackTrace = null;
-
- @Override
- final public void startService(final boolean removeFiles)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStopped();
- if (removeFiles) {
- removeFiles();
- if (logger.debugEnabled) {
- logger.debug("remove files");
- }
- }
- startServiceImpl(removeFiles);
- started = true;
- starterStackTrace = new Exception("starter stack trace");// NOPMD
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- /**
- * remove existing files
- *
- * @throws HeapException
- */
- protected abstract void removeFiles() throws HeapException;
-
- /**
- * to implement open actions
- *
- * @param removeFiles
- * @throws HeapException
- */
- protected abstract void startServiceImpl(final boolean removeFiles)
- throws HeapException;
-
- @Override
- final public void stopService() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- started = false;
- stopperStackTrace = new Exception("stopper stack trace");// NOPMD
- stopServiceImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- /**
- * to implement close actions
- *
- * @throws HeapException
- */
- protected abstract void stopServiceImpl() throws HeapException;
-
- @Override
- public boolean isServiceStarted() {
- return started;
- }
-
- @Override
- public void clear() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- clearImpl();
- if (logger.debugEnabled) {
- logger.debug("clear");
- }
- } catch (HeapException exception) {
- logger.fatal(CLEAR_STANDBY_MODIFICATION_FAILED);
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract void clearImpl() throws HeapException;
-
- @Override
- public void flush() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- flushImp();
- if (logger.debugEnabled) {
- logger.debug("flush");
- }
- } catch (HeapException exception) {
- logger.fatal(CLEAR_STANDBY_MODIFICATION_FAILED);
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- /**
- * implement all flush action after call to
- * {@link #updateHeapRecordImpl(DataRecordIdentifier, IHeapDataRecord)}
- *
- * @throws HeapException
- */
- protected abstract void flushImp() throws HeapException;
-
- @Override
- public void clearStandbyModification() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- clearStandbyModificationImpl();
- if (logger.debugEnabled) {
- logger.debug("clear standby modification");
- }
- } catch (HeapException exception) {
- logger.fatal(CLEAR_STANDBY_MODIFICATION_FAILED);
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract void clearStandbyModificationImpl() throws HeapException;
-
- @Override
- public DataRecordIdentifier getNextFreeDataRecordIdentifier()
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return getNextFreeDataRecordIdentifierImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract DataRecordIdentifier getNextFreeDataRecordIdentifierImpl()
- throws HeapException;
-
- @Override
- public void setNextFreeDataRecordIdentifier(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- setNextFreeDataRecordIdentifierImpl(dataRecordIdentifier);
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract void setNextFreeDataRecordIdentifierImpl(
- DataRecordIdentifier dataRecordIdentifier) throws HeapException;
-
- @Override
- public DataRecordIdentifier getNewDataRecordIdentifier()
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- final DataRecordIdentifier newDataRecordIdentifier = getNewDataRecordIdentifierImpl();
- if (logger.debugEnabled) {
- logger.debug("new;" + newDataRecordIdentifier);
- }
- return newDataRecordIdentifier;
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- /**
- * to get a new data identifier for future data record creation<br>
- *
- * @return the new data record identifier
- * @throws HeapException
- */
- protected abstract DataRecordIdentifier getNewDataRecordIdentifierImpl()
- throws HeapException;
-
- @Override
- public boolean deleteDataRecord(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- final boolean deleted = deleteDataRecordImpl(dataRecordIdentifier);
- if (logger.debugEnabled) {
- logger.debug("delete;" + dataRecordIdentifier);
- }
- return deleted;
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract boolean deleteDataRecordImpl(
- DataRecordIdentifier dataRecordIdentifier) throws HeapException;
-
- @Override
- public byte[] readDataRecord(final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- final byte[] data = readDataRecordImpl(dataRecordIdentifier);
- if (logger.debugEnabled) {
- logger.debug("read;" + dataRecordIdentifier + ";"
- + dataToString(data));
- }
- return data;
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract byte[] readDataRecordImpl(
- DataRecordIdentifier dataRecordIdentifier) throws HeapException;
-
- @Override
- public boolean writeDataRecord(
- final DataRecordIdentifier dataRecordIdentifier, final byte[] data)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- final boolean created = writeDataRecordImpl(dataRecordIdentifier,
- data);
- if (logger.debugEnabled) {
- logger.debug("write;" + dataRecordIdentifier + ";"
- + dataToString(data));
- }
- return created;
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- /**
- *
- * @param dataRecordIdentifier
- * @param data
- * @return true if data record created
- * @throws HeapException
- */
- protected abstract boolean writeDataRecordImpl(
- DataRecordIdentifier dataRecordIdentifier, byte[] data)
- throws HeapException;
-
- @Override
- public boolean hasDataRecord(final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return hasDataRecordImpl(dataRecordIdentifier);
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract boolean hasDataRecordImpl(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException;
-
- @Override
- public DataRecordIdentifier firstDataRecordIdentifier()
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return firstDataRecordIdentifierImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected DataRecordIdentifier firstDataRecordIdentifierImpl()
- throws HeapException {
- throw new HeapException(UNSUPPORTED_OPERATION);
- }
-
- @Override
- public DataRecordIdentifier lastDataRecordIdentifier() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return lastDataRecordIdentifierImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected DataRecordIdentifier lastDataRecordIdentifierImpl()
- throws HeapException {
- throw new HeapException(UNSUPPORTED_OPERATION);
- }
-
- @Override
- public DataRecordIdentifier lowerDataRecordIdentifier(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return lowerDataRecordIdentifierImpl(dataRecordIdentifier);
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected DataRecordIdentifier lowerDataRecordIdentifierImpl(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- throw new HeapException(UNSUPPORTED_OPERATION);
- }
-
- @Override
- public DataRecordIdentifier floorDataRecordIdentifier(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return floorDataRecordIdentifierImpl(dataRecordIdentifier);
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected DataRecordIdentifier floorDataRecordIdentifierImpl(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- throw new HeapException(UNSUPPORTED_OPERATION);
- }
-
- @Override
- public DataRecordIdentifier ceilingDataRecordIdentifier(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return ceilingDataRecordIdentifierImpl(dataRecordIdentifier);
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected DataRecordIdentifier ceilingDataRecordIdentifierImpl(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- throw new HeapException(UNSUPPORTED_OPERATION);
- }
-
- @Override
- public DataRecordIdentifier higherDataRecordIdentifier(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return higherDataRecordIdentifierImpl(dataRecordIdentifier);
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected DataRecordIdentifier higherDataRecordIdentifierImpl(
- final DataRecordIdentifier dataRecordIdentifier)
- throws HeapException {
- throw new HeapException(UNSUPPORTED_OPERATION);
- }
-
- @Override
- public DataRecordIdentifier removeFirstDataRecord() throws HeapException {
- // ASSERTX
- try {
- assert assertStarted();
- return removeFirstDataRecordImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract DataRecordIdentifier removeFirstDataRecordImpl()
- throws HeapException;
-
- @Override
- public int getNumberOfDataRecord() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return getNumberOfDataRecordImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- /**
- *
- * @return number of data record in heap file
- * @throws HeapException
- */
- protected abstract int getNumberOfDataRecordImpl() throws HeapException;
-
- @Override
- public int getNumberOfFreeRecord() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return getNumberOfFreeRecordImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract int getNumberOfFreeRecordImpl() throws HeapException;
-
- @Override
- public long heapSize() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return heapSizeImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract long heapSizeImpl() throws HeapException;
-
- @Override
- public long freeSize() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return freeSizeImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract long freeSizeImpl() throws HeapException;
-
- @Override
- public long usedSize() throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return usedSizeImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract long usedSizeImpl() throws HeapException;
-
- @Override
- public Set<DataRecordIdentifier> getDataRecordIdentifierSet()
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return getDataRecordIdentifierSetImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract Set<DataRecordIdentifier> getDataRecordIdentifierSetImpl()
- throws HeapException;
-
- @Override
- public Iterator<DataRecordIdentifier> dataRecordIterator()
- throws HeapException {
- try {
- // ASSERTX
- assert assertStarted();
- return dataRecordIteratorImpl();
- } catch (HeapException exception) {
- closeHeapManagerAfterException();
- throw exception;
- } catch (RuntimeException exception) {
- closeHeapManagerAfterException();
- throw exception;
- }
- }
-
- protected abstract Iterator<DataRecordIdentifier> dataRecordIteratorImpl();
-
- /**
- * assert the data management service is started
- *
- * @throws HeapException
- */
- private boolean assertStarted() throws HeapException {
- if (!started) {
- if (logger.debugEnabled) {
- logger.debug("closer stack trace", stopperStackTrace);
- }
- throw new HeapException(DATA_MANAGER_NOT_OPENED, stopperStackTrace);
- }
- return true;
- }
-
- /**
- * assert the data management service is stopped
- *
- * @throws HeapException
- */
- private boolean assertStopped() throws HeapException {
- if (started) {
- if (logger.debugEnabled) {
- logger.debug("openner stack trace", starterStackTrace);
- }
- throw new HeapException(DATA_MANAGER_ALREADY_OPENED,
- starterStackTrace);
- }
- return true;
- }
-
- /**
- * close heap element manager after exception
- *
- */
- protected abstract void closeHeapManagerAfterException();
-
- private String dataToString(final byte data[]) {
- final StringBuilder builder = new StringBuilder();
- if (data != null) {
- for (byte byteValue : data) {
- builder.append(String.format("%02X", (int) byteValue));
- }
- }
- return builder.toString();
- }
-}
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-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -39,6 +39,7 @@
import net.sf.joafip.kvstore.entity.EnumFileState;
import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.kvstore.record.service.IDataRecordKeyManager;
+import net.sf.joafip.kvstore.service.AbstractHeapDataManager;
import net.sf.joafip.kvstore.service.HeapException;
import net.sf.joafip.redblacktree.entity.IRBTNode;
import net.sf.joafip.redblacktree.service.IRBTVisitor;
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java 2012-04-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -37,6 +37,7 @@
import net.sf.joafip.heapfile.entity.DataBlock;
import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.kvstore.record.service.IDataRecordKeyManager;
+import net.sf.joafip.kvstore.service.AbstractHeapDataManager;
import net.sf.joafip.kvstore.service.HeapException;
/**
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java 2012-04-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -373,7 +373,7 @@
@Override
public void setDataRecordKeyComparator(
- final IDataRecordKeyManager dataRecordKeyComparator) {
+ final IDataRecordKeyManager dataRecordKeyComparator) throws HeapException {
firstDataManager.setDataRecordKeyComparator(dataRecordKeyComparator);
secondDataManager.setDataRecordKeyComparator(dataRecordKeyComparator);
}
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java 2012-04-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -28,6 +28,7 @@
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.kvstore.record.service.IDataRecordKeyManager;
+import net.sf.joafip.kvstore.service.AbstractHeapDataManager;
import net.sf.joafip.kvstore.service.HeapException;
/**
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java 2012-04-09 05:37:59 UTC (rev 2998)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -32,6 +32,7 @@
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.kvstore.record.service.IDataRecordKeyManager;
+import net.sf.joafip.kvstore.service.AbstractHeapDataManager;
import net.sf.joafip.kvstore.service.HeapException;
/**
Added: trunk/joafip-jdbm/.classpath
===================================================================
--- trunk/joafip-jdbm/.classpath (rev 0)
+++ trunk/joafip-jdbm/.classpath 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/joafip-jdbm/.pmd
===================================================================
--- trunk/joafip-jdbm/.pmd (rev 0)
+++ trunk/joafip-jdbm/.pmd 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd>
+ <useProjectRuleSet>true</useProjectRuleSet>
+ <ruleSetFile>C:\_DATA\java\eclipse\workspace\joafip-parent\pmd\.ruleset</ruleSetFile>
+ <includeDerivedFiles>false</includeDerivedFiles>
+ <violationsAsErrors>true</violationsAsErrors>
+</pmd>
Added: trunk/joafip-jdbm/.project
===================================================================
--- trunk/joafip-jdbm/.project (rev 0)
+++ trunk/joafip-jdbm/.project 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>joafip-jdbm</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/joafip-jdbm/.ruleset
===================================================================
--- trunk/joafip-jdbm/.ruleset (rev 0)
+++ trunk/joafip-jdbm/.ruleset 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0" name="pmd-eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
+ <description>PMD Plugin preferences rule set</description>
+ <rule ref="rulesets/typeresolution.xml/LooseCoupling"/>
+ <rule ref="rulesets/typeresolution.xml/CloneMethodMustImplementCloneable"/>
+ <rule ref="rulesets/typeresolution.xml/UnusedImports"/>
+ <rule ref="rulesets/typeresolution.xml/SignatureDeclareThrowsException"/>
+ <rule ref="rulesets/basic.xml/EmptyCatchBlock"/>
+ <rule ref="rulesets/basic.xml/EmptyIfStmt"/>
+ <rule ref="rulesets/basic.xml/EmptyWhileStmt"/>
+ <rule ref="rulesets/basic.xml/EmptyTryBlock"/>
+ <rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/EmptySwitchStatements"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+ <rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
+ <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/>
+ <rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
+ <rule ref="rulesets/basic.xml/UselessOperationOnImmutable"/>
+ <rule ref="rulesets/basic.xml/MisplacedNullCheck"/>
+ <rule ref="rulesets/basic.xml/UnusedNullCheckInEquals"/>
+ <rule ref="rulesets/basic.xml/AvoidThreadGroup"/>
+ <rule ref="rulesets/basic.xml/BrokenNullCheck"/>
+ <rule ref="rulesets/basic.xml/BigIntegerInstantiation"/>
+ <rule ref="rulesets/basic.xml/AvoidUsingOctalValues"/>
+ <rule ref="rulesets/basic.xml/AvoidUsingHardCodedIP"/>
+ <rule ref="rulesets/basic.xml/CheckResultSet"/>
+ <rule ref="rulesets/basic.xml/AvoidMultipleUnaryOperators"/>
+ <rule ref="rulesets/basic.xml/EmptyInitializer"/>
+ <rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>
+ <rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>
+ <rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>
+ <rule ref="rulesets/logging-java.xml/SystemPrintln"/>
+ <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>
+ <rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>
+ <rule ref="rulesets/controversial.xml/NullAssignment"/>
+ <rule ref="rulesets/controversial.xml/OnlyOneReturn"/>
+ <rule ref="rulesets/controversial.xml/UnusedModifier"/>
+ <rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+ <rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>
+ <rule ref="rulesets/controversial.xml/DontImportSun"/>
+ <rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>
+ <rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>
+ <rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+ <rule ref="rulesets/controversial.xml/DefaultPackage"/>
+ <rule ref="rulesets/controversial.xml/BooleanInversion"/>
+ <rule ref="rulesets/controversial.xml/DataflowAnomalyAnalysis"/>
+ <rule ref="rulesets/controversial.xml/AvoidFinalLocalVariable"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingShortType"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingVolatile"/>
+ <rule ref="rulesets/controversial.xml/AvoidUsingNativeCode"/>
+ <rule ref="rulesets/controversial.xml/AvoidAccessibilityAlteration"/>
+ <rule ref="rulesets/controversial.xml/DoNotCallGarbageCollectionExplicitly"/>
+ <rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>
+ <rule ref="rulesets/strings.xml/StringInstantiation"/>
+ <rule ref="rulesets/strings.xml/StringToString"/>
+ <rule ref="rulesets/strings.xml/InefficientStringBuffering"/>
+ <rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>
+ <rule ref="rulesets/strings.xml/UseStringBufferLength"/>
+ <rule ref="rulesets/strings.xml/AppendCharacterWithChar"/>
+ <rule ref="rulesets/strings.xml/ConsecutiveLiteralAppends"/>
+ <rule ref="rulesets/strings.xml/UseIndexOfChar"/>
+ <rule ref="rulesets/strings.xml/InefficientEmptyStringCheck"/>
+ <rule ref="rulesets/strings.xml/InsufficientStringBufferDeclaration"/>
+ <rule ref="rulesets/strings.xml/UselessStringValueOf"/>
+ <rule ref="rulesets/strings.xml/StringBufferInstantiationWithChar"/>
+ <rule ref="rulesets/strings.xml/UseEqualsToCompareStrings"/>
+ <rule ref="rulesets/strings.xml/AvoidStringBufferField"/>
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>
+ <rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>
+ <rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>
+ <rule ref="rulesets/strictexception.xml/AvoidRethrowingException"/>
+ <rule ref="rulesets/strictexception.xml/DoNotExtendJavaLangError"/>
+ <rule ref="rulesets/strictexception.xml/DoNotThrowExceptionInFinally"/>
+ <rule ref="rulesets/migrating.xml/ReplaceVectorWithList"/>
+ <rule ref="rulesets/migrating.xml/ReplaceHashtableWithMap"/>
+ <rule ref="rulesets/migrating.xml/ReplaceEnumerationWithIterator"/>
+ <rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier"/>
+ <rule ref="rulesets/migrating.xml/AvoidAssertAsIdentifier"/>
+ <rule ref="rulesets/migrating.xml/IntegerInstantiation"/>
+ <rule ref="rulesets/migrating.xml/ByteInstantiation"/>
+ <rule ref="rulesets/migrating.xml/ShortInstantiation"/>
+ <rule ref="rulesets/migrating.xml/LongInstantiation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseBeforeAnnotation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseAfterAnnotation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseTestAnnotation"/>
+ <rule ref="rulesets/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation"/>
+ <rule ref="rulesets/migrating.xml/JUnitUseExpected"/>
+ <rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>
+ <rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>
+ <rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>
+ <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>
+ <rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>
+ <rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>
+ <rule ref="rulesets/optimizations.xml/UseArraysAsList"/>
+ <rule ref="rulesets/optimizations.xml/AvoidArrayLoops"/>
+ <rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation"/>
+ <rule ref="rulesets/optimizations.xml/AddEmptyString"/>
+ <rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>
+ <rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>
+ <rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>
+ <rule ref="rulesets/coupling.xml/ExcessiveImports"/>
+ <rule ref="rulesets/coupling.xml/LooseCoupling"/>
+ <rule ref="rulesets/imports.xml/DuplicateImports"/>
+ <rule ref="rulesets/imports.xml/DontImportJavaLang"/>
+ <rule ref="rulesets/imports.xml/UnusedImports"/>
+ <rule ref="rulesets/imports.xml/ImportFromSamePackage"/>
+ <rule ref="rulesets/imports.xml/TooManyStaticImports"/>
+ <rule ref="rulesets/junit.xml/JUnitStaticSuite"/>
+ <rule ref="rulesets/junit.xml/JUnitSpelling"/>
+ <rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>
+ <rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>
+ <rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>
+ <rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>
+ <rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/UseAssertNullInsteadOfAssertTrue"/>
+ <rule ref="rulesets/junit.xml/SimplifyBooleanAssertion"/>
+ <rule ref="rulesets/naming.xml/ShortVariable"/>
+ <rule ref="rulesets/naming.xml/LongVariable"/>
+ <rule ref="rulesets/naming.xml/ShortMethodName"/>
+ <rule ref="rulesets/naming.xml/AbstractNaming"/>
+ <rule ref="rulesets/naming.xml/AvoidDollarSigns"/>
+ <rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>
+ <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>
+ <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>
+ <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName"/>
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>
+ <rule ref="rulesets/naming.xml/NoPackage"/>
+ <rule ref="rulesets/naming.xml/PackageCase"/>
+ <rule ref="rulesets/naming.xml/MisleadingVariableName"/>
+ <rule ref="rulesets/naming.xml/BooleanGetMethodName"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>
+ <rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>
+ <rule ref="rulesets/codesize.xml/NcssMethodCount"/>
+ <rule ref="rulesets/codesize.xml/NcssTypeCount"/>
+ <rule ref="rulesets/codesize.xml/NcssConstructorCount"/>
+ <rule ref="rulesets/codesize.xml/TooManyMethods"/>
+ <rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>
+ <rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>
+ <rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>
+ <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>
+ <rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>
+ <rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>
+ <rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>
+ <rule ref="rulesets/clone.xml/ProperCloneImplementation"/>
+ <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>
+ <rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>
+ <rule ref="rulesets/design.xml/UseSingleton"/>
+ <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+ <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+ <rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>
+ <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>
+ <rule ref="rulesets/design.xml/AvoidReassigningParameters"/>
+ <rule ref="rulesets/design.xml/SwitchDensity"/>
+ <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+ <rule ref="rulesets/design.xml/AccessorClassGeneration"/>
+ <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
+ <rule ref="rulesets/design.xml/CloseResource"/>
+ <rule ref="rulesets/design.xml/NonStaticInitializer"/>
+ <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>
+ <rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>
+ <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+ <rule ref="rulesets/design.xml/BadComparison"/>
+ <rule ref="rulesets/design.xml/EqualsNull"/>
+ <rule ref="rulesets/design.xml/ConfusingTernary"/>
+ <rule ref="rulesets/design.xml/InstantiationToGetClass"/>
+ <rule ref="rulesets/design.xml/IdempotentOperations"/>
+ <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
+ <rule ref="rulesets/design.xml/ImmutableField"/>
+ <rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>
+ <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+ <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>
+ <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>
+ <rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>
+ <rule ref="rulesets/design.xml/MissingBreakInSwitch"/>
+ <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>
+ <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>
+ <rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>
+ <rule ref="rulesets/design.xml/SimplifyConditional"/>
+ <rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>
+ <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+ <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+ <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
+ <rule ref="rulesets/design.xml/UncommentedEmptyMethod"/>
+ <rule ref="rulesets/design.xml/UncommentedEmptyConstructor"/>
+ <rule ref="rulesets/design.xml/AvoidConstantsInterface"/>
+ <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter"/>
+ <rule ref="rulesets/design.xml/PreserveStackTrace"/>
+ <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
+ <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
+ <rule ref="rulesets/design.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
+ <rule ref="rulesets/design.xml/SingularField"/>
+ <rule ref="rulesets/design.xml/ReturnEmptyArrayRatherThanNull"/>
+ <rule ref="rulesets/design.xml/AbstractClassWithoutAnyMethod"/>
+ <rule ref="rulesets/design.xml/TooFewBranchesForASwitchStatement"/>
+</ruleset>
Added: trunk/joafip-jdbm/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/joafip-jdbm/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/joafip-jdbm/.settings/org.eclipse.core.resources.prefs 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,7 @@
+#Sun Apr 08 22:23:02 CEST 2012
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
Added: trunk/joafip-jdbm/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/joafip-jdbm/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/joafip-jdbm/.settings/org.eclipse.jdt.core.prefs 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,82 @@
+#Sun Apr 08 23:04:05 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/joafip-jdbm/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/joafip-jdbm/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/joafip-jdbm/.settings/org.eclipse.m2e.core.prefs 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,5 @@
+#Sun Apr 08 22:11:55 CEST 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: trunk/joafip-jdbm/pom.xml
===================================================================
--- trunk/joafip-jdbm/pom.xml (rev 0)
+++ trunk/joafip-jdbm/pom.xml 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../joafip-parent</relativePath>
+ </parent>
+ <!-- <groupId>net.sf.joafip</groupId> -->
+ <artifactId>joafip-jdbm</artifactId>
+ <packaging>jar</packaging>
+ <version>4.0.0b8</version>
+ <url>http://joafip.sourceforge.net/</url>
+ <name>Joafip storage using jdbm</name>
+
+ <!-- <sourceDirectory>src_maven/main/java</sourceDirectory> <testSourceDirectory>src_maven/test/java</testSourceDirectory>
+ <resources><resource><directory>src_maven/main/resource</directory></resource></resources> -->
+
+ <dependencies>
+
+ <dependency>
+ <groupId>jdbm</groupId>
+ <artifactId>jdbm</artifactId>
+ <version>2.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-common</artifactId>
+ <version>4.0.0b8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-common</artifactId>
+ <version>4.0.0b8</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-kvstore</artifactId>
+ <version>4.0.0b8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-log4j</artifactId>
+ <version>4.0.0b8</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java
===================================================================
--- trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java (rev 0)
+++ trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java 2012-04-09 05:41:25 UTC (rev 2999)
@@ -0,0 +1,289 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * 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
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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.jdbm.service;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.Set;...
[truncated message content] |
|
From: <luc...@us...> - 2012-04-09 05:41:32
|
Revision: 2999
http://joafip.svn.sourceforge.net/joafip/?rev=2999&view=rev
Author: luc_peuvrier
Date: 2012-04-09 05:41:25 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
data manager using jdbm library
Modified Paths:
--------------
trunk/joafip-4test/pom.xml
trunk/joafip-common/src/main/java/net/sf/joafip/logger/DummyLogger.java
trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/IHeapDataManager.java
trunk/joafip-parent/pom.xml
Added Paths:
-----------
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
trunk/joafip-jdbm/.classpath
trunk/joafip-jdbm/.pmd
trunk/joafip-jdbm/.project
trunk/joafip-jdbm/.ruleset
trunk/joafip-jdbm/.settings/
trunk/joafip-jdbm/.settings/org.eclipse.core.resources.prefs
trunk/joafip-jdbm/.settings/org.eclipse.jdt.core.prefs
trunk/joafip-jdbm/.settings/org.eclipse.m2e.core.prefs
trunk/joafip-jdbm/pom.xml
trunk/joafip-jdbm/src/
trunk/joafip-jdbm/src/main/
trunk/joafip-jdbm/src/main/java/
trunk/joafip-jdbm/src/main/java/net/
trunk/joafip-jdbm/src/main/java/net/sf/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/entity/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java
trunk/joafip-jdbm/src/main/resources/
trunk/joafip-jdbm/src/test/
trunk/joafip-jdbm/src/test/java/
trunk/joafip-jdbm/src/test/resources/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/AbstractHeapDataManager.java
trunk/joafip-log4j/src/test/java/net/
trunk/joafip-log4j/src/test/java/net/sf/
trunk/joafip-log4j/src/test/java/net/sf/joafip/
trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/
trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
Removed Paths:
-------------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-09 05:38:05
|
Revision: 2998
http://joafip.svn.sourceforge.net/joafip/?rev=2998&view=rev
Author: luc_peuvrier
Date: 2012-04-09 05:37:59 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Initial import of jdbm use.
Added Paths:
-----------
trunk/joafip-jdbm/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-09 05:38:05
|
Revision: 2998
http://joafip.svn.sourceforge.net/joafip/?rev=2998&view=rev
Author: luc_peuvrier
Date: 2012-04-09 05:37:59 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Initial import of jdbm use.
Added Paths:
-----------
trunk/joafip-jdbm/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-08 06:48:26
|
Revision: 2997
http://joafip.svn.sourceforge.net/joafip/?rev=2997&view=rev
Author: luc_peuvrier
Date: 2012-04-08 06:48:19 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
warning correction
Modified Paths:
--------------
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerImpl.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithKey.java
Removed Paths:
-------------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-08 06:48:25
|
Revision: 2997
http://joafip.svn.sourceforge.net/joafip/?rev=2997&view=rev
Author: luc_peuvrier
Date: 2012-04-08 06:48:19 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
warning correction
Modified Paths:
--------------
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerImpl.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithKey.java
Removed Paths:
-------------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerImpl.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerImpl.java 2012-04-08 03:03:31 UTC (rev 2996)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerImpl.java 2012-04-08 06:48:19 UTC (rev 2997)
@@ -38,6 +38,8 @@
public abstract class AbstractTestHeapDataManagerImpl extends
AbstractTestHeapDataManagerRecord {
+ private static final String BAD_VALUE = "bad value";
+
private static final String MUST_DELETE_1 = "must delete #1";
private static final String MUST_NOT_HAVE_DATA_RECORD = "must not have data record";
@@ -383,7 +385,7 @@
final DataRecordIdentifier identifier = new DataRecordIdentifier(0);
data = heapDataManager.readDataRecord(identifier);
for (int index = 0; index < 20; index++) {
- assertEquals("bad value", data[index], index);
+ assertEquals(BAD_VALUE, data[index], index);
}
for (int index = 0; index < 20; index++) {
data[index] = (byte) (10 + index);
@@ -393,7 +395,7 @@
createHeap(false/* remove file */);
data = heapDataManager.readDataRecord(identifier);
for (int index = 0; index < 20; index++) {
- assertEquals("bad value", data[index], 10 + index);
+ assertEquals(BAD_VALUE, data[index], 10 + index);
}
}
@@ -615,10 +617,10 @@
heapDataManager.flush();
identifier = heapDataManager.removeFirstDataRecord();
assertNotNull("must deleted first data record", identifier);
- assertEquals(0L, identifier.value);
+ assertEquals(BAD_VALUE,0L, identifier.value);
identifier = heapDataManager.removeFirstDataRecord();
assertNotNull("must deleted first data record", identifier);
- assertEquals(1L, identifier.value);
+ assertEquals(BAD_VALUE,1L, identifier.value);
assertNull(MUST_NOT_HAVE_DATA_RECORD,
heapDataManager.removeFirstDataRecord());
}
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-08 03:03:31 UTC (rev 2996)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapFileDataMgrWithKey.java 2012-04-08 06:48:19 UTC (rev 2997)
@@ -58,7 +58,7 @@
assertTrue("must found 'A'", heapDataManager.hasDataRecord(keyA));
final byte[] readDataA = heapDataManager.readDataRecord(keyA);
assertNotNull("must read 'A' data", readDataA);
- assertEquals("valueA", new String(readDataA));
+ assertEquals("bad value","valueA", new String(readDataA));
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-08 03:03:44
|
Revision: 2996
http://joafip.svn.sourceforge.net/joafip/?rev=2996&view=rev
Author: luc_peuvrier
Date: 2012-04-08 03:03:31 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
kvstore sub project intoduced to enable new implementation of data manager based on key value storage
Modified Paths:
--------------
trunk/joafip/pom.xml
trunk/joafip/src/main/java/net/sf/joafip/entity/FilePersistenceProperties.java
trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java
trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java
trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistenceBuilder.java
trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreHeader.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreProperties.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/export_import/in/ObjectModelForImport.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/DataRecordIdentifierRBTNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/GarbageReferenceLinkRBTNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLink.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLinkGarbageException.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/Referencing.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferencingReferencedKey.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordable.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/IHeapRecordable.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ClassNameRecord.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectClassInfoAndDeclared.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectLinkTreeNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/SerializerModel.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/saver/StoreSaverSession.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/AbstractConverter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/NullableAndTypedReferenceConverter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/ReferenceConverter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractCurrentHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractInFieldInArrayHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectsHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InStaticFieldHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/AbstractExporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/StoreAccessForExport.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/XmlExporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/GarbageManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/IGarbageManagerForCollect.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/IGarbageManagerForLinkUpdate.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/LinkManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/StoreGarbager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/AbstractDataRecordIdentifierRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/AbstractGarbageRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/GarbageCandidateRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/GarbageReferenceLinkRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/ToGarbageRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/ToVisitRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/VisitedRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/GarbageCandidateRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/LinkRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/ToGarbageRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/ToVisitRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/VisitedRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/heaprecordable/HeapRecordableManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerDelegatingToStateMap.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ClassNameManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/HeaderReader.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/IClassNameManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/IObjectIOManagerForObjectIO.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/IObjectIOManagerForProxyObjectIO.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/IObjectIoManagerForGarbage.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectIOManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectStateMgr.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/SerializerObjectIOManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/ObjectIODummy.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractImmediateObjectInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractObjectInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractObjectInputGeneric.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractObjectInputImmediate.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractObjectInputLazy.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/BasicOrReferenceInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/IObjectInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputForArray.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputForBasic.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputForEnum.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputForString.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputSerialize.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputSerializeGZipped.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputSerializeZipped.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ReferenceInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/output/ReferenceOutput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/IProxyManagerForObjectIO.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/SerializerProxyManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/saver/ForSaveLinkManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/saver/StoreSaver3.java
trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestCustomDataManager.java
trunk/joafip/src/test/java/net/sf/joafip/service/Bob1ObjectInputForTestCustom.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestCrashSafe.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestMultipleFilePersistenceInstance.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistenceMemory.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/AbstractTestSubstitutionWithMethodInterception.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestExclusiveDataAccessSession.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/entity/garbage/ReferenceLinkEntry.java
trunk/joafip/src/test/java/net/sf/joafip/store/entity/garbage/ReferenceLinkGraph.java
trunk/joafip/src/test/java/net/sf/joafip/store/entity/objectio/manager/WriteResult.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractDataManagerTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractGarbageTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestGarbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestLinkManagement.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestNoGarbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestObjectReferenceLink.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStore.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStoreForPersistenteClass.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStoreWithBob.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/ForTestObjectInput.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestStoreVisitedModified.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestReferenceConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestReferenceNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/bytecode/TestPersistableCodeGeneratorInStore.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/AbstractTestDeepCopier.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/GarbageDataIntegrityChecker.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/GarbageManagerForLinkUpdateMock.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestLinkManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestReferenceLinkGraph.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestStoreGarbager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/AbstractGarbageManagerTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestGarbageCandidateRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestLinkRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestToGarbageRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/heaprecordable/TestHeapRecordableManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/TestClassNameManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/AbstractBinaryDump.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/AbstractTestIoManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/ClassNameManagerMock.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/TestObjectIOManagerGenericCases.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/TestObjectIOManagerSerializeCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractObjectIOTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractSerializeTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/ObjectIOBasicTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/AbstractObjectIoManagerForProxyTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/ProxyCallBackForTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyAutoSave.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyCreation.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyCreationConstructed.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyFieldReflect.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyInterceptPackageVisibility.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyInterceptPrivate.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyInterceptProtected.java
trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeBlockFile.java
trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeDual.java
trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeMultiFile.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractInserter.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractSearcher.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/ExporterBKM.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBKM.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/SearcherBKM.java
trunk/joafip-4test/src/main/java/net/sf/joafip/service/AbstractCrash.java
trunk/joafip-4test/src/main/java/net/sf/joafip/service/MainCrash.java
trunk/joafip-4test/src/main/java/net/sf/joafip/service/changelog/CheckSaved.java
trunk/joafip-example-hugemap/src/main/java/net/sf/joafip/hugemap/AbstractPersistence.java
trunk/joafip-heapfile/pom.xml
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/AbstractFileStorable.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/DataAndDataRecordIdentifier.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/HeapFileSetup.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/IFileStorable.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/AbstractHeapRBTNode.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapFreeNode.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapHeader.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapIdNode.java
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/AbstractDataRecordKeyComparator.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/AbstractHeapNodeManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.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/HeapFreeNodeManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/HeapIdNodeManager.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/AbstractFileFor.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AutoSaveHeapFileDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/FileForStorable.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileState.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IFileForStorable.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/entity/BlockDataManagerHeader.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/TestIdNode.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestAbstractFileStorable.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestDataRecordIdentifier.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestMarshall.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/AbstractTestHeapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerImpl.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerRecord.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/FileDataManagerIntegrityChecker.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/FileForStorableBridge.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapFileCheckerDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapRecordIterator.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestBlockDataManager.java
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-parent/pom.xml
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMap.java
Added Paths:
-----------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/entity/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/record/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/record/entity/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/record/service/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/service/
trunk/joafip-kvstore/.classpath
trunk/joafip-kvstore/.pmd
trunk/joafip-kvstore/.project
trunk/joafip-kvstore/.ruleset
trunk/joafip-kvstore/.settings/
trunk/joafip-kvstore/.settings/org.eclipse.core.resources.prefs
trunk/joafip-kvstore/.settings/org.eclipse.jdt.core.prefs
trunk/joafip-kvstore/.settings/org.eclipse.m2e.core.prefs
trunk/joafip-kvstore/pom.xml
trunk/joafip-kvstore/src/
trunk/joafip-kvstore/src/main/
trunk/joafip-kvstore/src/main/java/
trunk/joafip-kvstore/src/main/java/net/
trunk/joafip-kvstore/src/main/java/net/sf/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/entity/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/entity/EnumFileState.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/DataRecordIdentifier.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/IDataRecordKey.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/NullDataRecordKey.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/service/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/service/IDataRecordKeyManager.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/HeapException.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/HeapRuntimeException.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/IHeapDataManager.java
trunk/joafip-kvstore/src/main/resources/
trunk/joafip-kvstore/src/test/
trunk/joafip-kvstore/src/test/java/
trunk/joafip-kvstore/src/test/resources/
Removed Paths:
-------------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/EnumFileState.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordIdentifier.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/IDataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/NullDataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapException.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapRuntimeException.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IHeapDataManager.java
Modified: trunk/joafip/pom.xml
===================================================================
--- trunk/joafip/pom.xml 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/pom.xml 2012-04-08 03:03:31 UTC (rev 2996)
@@ -39,6 +39,12 @@
<dependency>
<groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-kvstore</artifactId>
+ <version>4.0.0b8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
<artifactId>joafip-heapfile</artifactId>
<version>4.0.0b8</version>
</dependency>
Modified: trunk/joafip/src/main/java/net/sf/joafip/entity/FilePersistenceProperties.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/entity/FilePersistenceProperties.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/entity/FilePersistenceProperties.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -23,7 +23,7 @@
import java.util.TreeSet;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.store.entity.StoreProperties;
import net.sf.joafip.store.service.conversion.def.InputStreamAndSource;
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -29,8 +29,8 @@
import net.sf.joafip.NoStorableAccess;
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.entity.MutableInteger;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.logger.JoafipLogger;
import net.sf.joafip.store.entity.EnumKey;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -37,11 +37,11 @@
import net.sf.joafip.entity.FilePersistenceProperties;
import net.sf.joafip.entity.FilePersistencePropertyEntry;
import net.sf.joafip.file.service.FileIOException;
-import net.sf.joafip.heapfile.entity.EnumFileState;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
import net.sf.joafip.heapfile.service.HeapFileState;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
import net.sf.joafip.java.util.PTreeMap;
+import net.sf.joafip.kvstore.entity.EnumFileState;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.logger.JoafipLogger;
import net.sf.joafip.reflect.ExceptionOfTarget;
import net.sf.joafip.reflect.HelperReflect;
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistenceBuilder.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistenceBuilder.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistenceBuilder.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -25,7 +25,7 @@
import net.sf.joafip.NoStorableAccess;
import net.sf.joafip.entity.EnumNoMoreDataAction;
import net.sf.joafip.entity.FilePersistenceProperties;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.store.service.conversion.def.InputStreamAndSource;
/**
Modified: trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -29,7 +29,7 @@
import net.sf.joafip.StorableClass;
import net.sf.joafip.StoreSerializeAndZippedInOneRecord;
import net.sf.joafip.entity.MutableInteger;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.service.IGarbageListener;
import net.sf.joafip.store.service.export_import.in.IImportListener;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreHeader.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreHeader.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreHeader.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.garbage.EnumGarbageCollectorState;
import net.sf.joafip.store.entity.heaprecordable.AbstractHeapRecordable;
import net.sf.joafip.store.service.StoreException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreProperties.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreProperties.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreProperties.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -16,7 +16,7 @@
*/
package net.sf.joafip.store.entity;// NOPMD
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.store.service.conversion.def.InputStreamAndSource;
/**
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/export_import/in/ObjectModelForImport.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/export_import/in/ObjectModelForImport.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/export_import/in/ObjectModelForImport.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -25,7 +25,7 @@
import java.util.Deque;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.entity.classinfo.FieldInfo;
import net.sf.joafip.store.entity.conversion.ClassReplacementDef;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/DataRecordIdentifierRBTNode.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/DataRecordIdentifierRBTNode.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/DataRecordIdentifierRBTNode.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity.garbage;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.redblacktree.service.RBTException;
import net.sf.joafip.store.entity.heaprecordable.AbstractHeapRecordableRBTNode;
import net.sf.joafip.store.service.binary.AbstractConverter;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/GarbageReferenceLinkRBTNode.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/GarbageReferenceLinkRBTNode.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/GarbageReferenceLinkRBTNode.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -19,7 +19,7 @@
import java.util.Collection;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.redblacktree.service.RBTException;
import net.sf.joafip.store.entity.heaprecordable.AbstractHeapRecordableRBTNode;
import net.sf.joafip.store.service.binary.AbstractConverter;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLink.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLink.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLink.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -23,7 +23,7 @@
import java.util.TreeMap;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.service.garbage.GarbageException;
/**
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLinkGarbageException.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLinkGarbageException.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLinkGarbageException.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -1,7 +1,7 @@
package net.sf.joafip.store.entity.garbage;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
@NotStorableClass
public class ReferenceLinkGarbageException extends Exception {
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/Referencing.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/Referencing.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/Referencing.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity.garbage;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
/**
* store referencing data record identifier and link count
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferencingReferencedKey.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferencingReferencedKey.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferencingReferencedKey.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity.garbage;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
/**
* couple of referencing and referenced data record identifier used as key
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordable.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordable.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordable.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity.heaprecordable;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.logger.JoafipLogger;
import net.sf.joafip.store.service.binary.HelperBinaryConversion;
import net.sf.joafip.store.service.heaprecordable.HeapRecordableException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity.heaprecordable;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.redblacktree.entity.IRBTComparableNode;
import net.sf.joafip.redblacktree.entity.IRBTNode;
import net.sf.joafip.redblacktree.entity.RBTSentinel;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/IHeapRecordable.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/IHeapRecordable.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/IHeapRecordable.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -16,7 +16,7 @@
*/
package net.sf.joafip.store.entity.heaprecordable;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.service.heaprecordable.HeapRecordableException;
/**
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ClassNameRecord.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ClassNameRecord.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ClassNameRecord.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity.objectio;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.heaprecordable.AbstractHeapRecordable;
import net.sf.joafip.store.service.binary.AbstractConverter;
import net.sf.joafip.store.service.binary.BinaryConverterException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -30,7 +30,7 @@
import java.util.Map;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.StoreRoot4;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.entity.classinfo.FieldInfo;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectClassInfoAndDeclared.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectClassInfoAndDeclared.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectClassInfoAndDeclared.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity.objectio;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
/**
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectLinkTreeNode.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectLinkTreeNode.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectLinkTreeNode.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.entity.objectio;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
/**
* Link information for an object<br>
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -28,7 +28,7 @@
import net.sf.joafip.Fortest;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.service.classinfo.ClassInfoException;
import net.sf.joafip.store.service.objectio.ObjectIOException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/SerializerModel.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/SerializerModel.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/SerializerModel.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -27,7 +27,7 @@
import java.util.TreeMap;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.service.classinfo.ClassInfoException;
import net.sf.joafip.store.service.objectio.ObjectIOException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/saver/StoreSaverSession.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/saver/StoreSaverSession.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/saver/StoreSaverSession.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -25,7 +25,7 @@
import java.util.TreeSet;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.logger.JoafipLogger;
import net.sf.joafip.store.entity.objectio.ObjectAndPersistInfo;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -26,8 +26,8 @@
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.entity.EnumStoreMode;
import net.sf.joafip.entity.MutableInteger;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.reflect.HelperReflect;
import net.sf.joafip.reflect.ReflectException;
import net.sf.joafip.service.ClassLoaderProvider;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -20,10 +20,10 @@
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.heapfile.entity.HeapFileSetup;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.HeapException;
import net.sf.joafip.heapfile.service.HeapFileDataManager;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.HeapException;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.logger.JoafipLogger;
/**
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -27,8 +27,8 @@
import net.sf.joafip.Fortest;
import net.sf.joafip.entity.EnumStoreMode;
import net.sf.joafip.entity.MutableInteger;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.service.ClassLoaderProvider;
import net.sf.joafip.service.IAutoSaveEventListener;
import net.sf.joafip.service.IFilePersistenceAutoSaver;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -39,8 +39,6 @@
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.StorableAccess;
import net.sf.joafip.asm.Type;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.HeapException;
import net.sf.joafip.java.util.PArrayList;
import net.sf.joafip.java.util.PConcurrentHashMap;
import net.sf.joafip.java.util.PHashMap;
@@ -51,6 +49,8 @@
import net.sf.joafip.java.util.PTreeMap;
import net.sf.joafip.java.util.PTreeSet;
import net.sf.joafip.java.util.PVector;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.HeapException;
import net.sf.joafip.service.IAutoSaveEventListener;
import net.sf.joafip.store.entity.EnumKey;
import net.sf.joafip.store.entity.StoreProperties;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/AbstractConverter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/AbstractConverter.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/AbstractConverter.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.service.binary;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.service.objectio.ObjectIOClassNotFoundException;
import net.sf.joafip.store.service.objectio.ObjectIODataCorruptedException;
import net.sf.joafip.store.service.objectio.ObjectIODataRecordNotFoundException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/NullableAndTypedReferenceConverter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/NullableAndTypedReferenceConverter.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/NullableAndTypedReferenceConverter.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.service.binary;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
/**
* converter for reference<br>
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/ReferenceConverter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/ReferenceConverter.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/ReferenceConverter.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -17,7 +17,7 @@
package net.sf.joafip.store.service.binary;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
@NotStorableClass
public class ReferenceConverter extends AbstractConverter {
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractCurrentHandler.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractCurrentHandler.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractCurrentHandler.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -20,7 +20,7 @@
import java.util.TreeMap;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.logger.JoafipLogger;
import net.sf.joafip.store.entity.export_import.in.ClassDef;
import net.sf.joafip.store.entity.export_import.in.ObjectModelForImport;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -27,9 +27,9 @@
import java.util.TreeMap;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.HeapException;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.HeapException;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.logger.JoafipLogger;
import net.sf.joafip.reflect.HelperReflect;
import net.sf.joafip.reflect.ReflectException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractInFieldInArrayHandler.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractInFieldInArrayHandler.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractInFieldInArrayHandler.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -19,7 +19,7 @@
import java.util.Map;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.entity.conversion.ValuedFieldList;
import net.sf.joafip.store.entity.export_import.in.ClassDef;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -21,8 +21,8 @@
import java.util.TreeSet;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
import net.sf.joafip.java.util.PTreeSet;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.StoreRoot4;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.entity.classinfo.FieldInfo;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectsHandler.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectsHandler.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectsHandler.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -19,7 +19,7 @@
import java.util.Map;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.entity.conversion.ValuedFieldList;
import net.sf.joafip.store.entity.export_import.in.ClassDef;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InStaticFieldHandler.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InStaticFieldHandler.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InStaticFieldHandler.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -27,7 +27,7 @@
import java.util.TreeSet;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/AbstractExporter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/AbstractExporter.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/AbstractExporter.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -35,8 +35,8 @@
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.StorableAccess;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.HeapException;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.HeapException;
import net.sf.joafip.logger.JoafipLogger;
import net.sf.joafip.reflect.DoPrivilegedSetFieldAccessible;
import net.sf.joafip.reflect.HelperReflect;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -26,10 +26,10 @@
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.heapfile.entity.HeapFileSetup;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
import net.sf.joafip.heapfile.service.AutoSaveHeapFileDataManager;
-import net.sf.joafip.heapfile.service.HeapException;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.HeapException;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
/**
*
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/StoreAccessForExport.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/StoreAccessForExport.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/StoreAccessForExport.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -22,9 +22,9 @@
*/
package net.sf.joafip.store.service.export_import.out;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.HeapException;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.HeapException;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.service.ClassLoaderProvider;
import net.sf.joafip.store.entity.StoreSynchro;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/XmlExporter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/XmlExporter.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/XmlExporter.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -24,7 +24,7 @@
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.file.service.FileOutputStreamNIO;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
import net.sf.joafip.store.entity.classinfo.ClassInfo;
import net.sf.joafip.store.service.IStore;
import net.sf.joafip.store.service.StoreException;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/GarbageManager.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/GarbageManager.java 2012-04-08 02:50:43 UTC (rev 2995)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/GarbageManager.java 2012-04-08 03:03:31 UTC (rev 2996)
@@ -20,9 +20,9 @@
import net.sf.joafip.Fortest;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.service.HeapException;
-import net.sf.joafip.heapfile.service.IHeapDataManager;
+import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.service.HeapException;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
import net.sf.joafip.logger.JoafipLogger;
import net.sf.joafip.service.JoafipMutex;
import net.sf.joafip.store.entity.StoreHeader;
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/IGarbageManagerForCollect.java
=============================================================...
[truncated message content] |
|
From: <luc...@us...> - 2012-04-08 03:03:42
|
Revision: 2996
http://joafip.svn.sourceforge.net/joafip/?rev=2996&view=rev
Author: luc_peuvrier
Date: 2012-04-08 03:03:31 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
kvstore sub project intoduced to enable new implementation of data manager based on key value storage
Modified Paths:
--------------
trunk/joafip/pom.xml
trunk/joafip/src/main/java/net/sf/joafip/entity/FilePersistenceProperties.java
trunk/joafip/src/main/java/net/sf/joafip/service/AbstractFilePersistenceDelegatingToStore.java
trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistence.java
trunk/joafip/src/main/java/net/sf/joafip/service/FilePersistenceBuilder.java
trunk/joafip/src/main/java/net/sf/joafip/service/IFilePersistence.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreHeader.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/StoreProperties.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/export_import/in/ObjectModelForImport.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/DataRecordIdentifierRBTNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/GarbageReferenceLinkRBTNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLink.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferenceLinkGarbageException.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/Referencing.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/garbage/ReferencingReferencedKey.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordable.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/IHeapRecordable.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ClassNameRecord.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectClassInfoAndDeclared.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectLinkTreeNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/SerializerModel.java
trunk/joafip/src/main/java/net/sf/joafip/store/entity/saver/StoreSaverSession.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractDelegatingToStoreManagers.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/IStore.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/Store.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/AbstractConverter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/NullableAndTypedReferenceConverter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/binary/ReferenceConverter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractCurrentHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractImporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractInFieldInArrayHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectsHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InStaticFieldHandler.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/AbstractExporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/StoreAccessForExport.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/XmlExporter.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/GarbageManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/IGarbageManagerForCollect.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/IGarbageManagerForLinkUpdate.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/LinkManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/StoreGarbager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/AbstractDataRecordIdentifierRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/AbstractGarbageRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/GarbageCandidateRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/GarbageReferenceLinkRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/ToGarbageRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/ToVisitRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/rbt/VisitedRBTNodeManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/GarbageCandidateRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/LinkRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/ToGarbageRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/ToVisitRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/garbage/recordmgr/VisitedRecordManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/heaprecordable/HeapRecordableManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerDelegatingToStateMap.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ClassNameManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/HeaderReader.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/IClassNameManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/IObjectIOManagerForObjectIO.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/IObjectIOManagerForProxyObjectIO.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/IObjectIoManagerForGarbage.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectIOManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectStateMgr.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/SerializerObjectIOManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/ObjectIODummy.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractImmediateObjectInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractObjectInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractObjectInputGeneric.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractObjectInputImmediate.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/AbstractObjectInputLazy.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/BasicOrReferenceInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/IObjectInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputForArray.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputForBasic.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputForEnum.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputForString.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputSerialize.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputSerializeGZipped.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ObjectInputSerializeZipped.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/input/ReferenceInput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/output/ReferenceOutput.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/IProxyManagerForObjectIO.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/SerializerProxyManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/saver/ForSaveLinkManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/saver/StoreSaver3.java
trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestCustomDataManager.java
trunk/joafip/src/test/java/net/sf/joafip/service/Bob1ObjectInputForTestCustom.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestCrashSafe.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestMultipleFilePersistenceInstance.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistenceMemory.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/AbstractTestSubstitutionWithMethodInterception.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestExclusiveDataAccessSession.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/entity/garbage/ReferenceLinkEntry.java
trunk/joafip/src/test/java/net/sf/joafip/store/entity/garbage/ReferenceLinkGraph.java
trunk/joafip/src/test/java/net/sf/joafip/store/entity/objectio/manager/WriteResult.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractDataManagerTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractGarbageTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestGarbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestLinkManagement.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestNoGarbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestObjectReferenceLink.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStore.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStoreForPersistenteClass.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStoreWithBob.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/ForTestObjectInput.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/StoreForTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestStoreVisitedModified.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestReferenceConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestReferenceNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/bytecode/TestPersistableCodeGeneratorInStore.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/AbstractTestDeepCopier.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/GarbageDataIntegrityChecker.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/GarbageManagerForLinkUpdateMock.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestLinkManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestReferenceLinkGraph.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestStoreGarbager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/AbstractGarbageManagerTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestGarbageCandidateRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestLinkRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestToGarbageRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/heaprecordable/TestHeapRecordableManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/TestClassNameManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/AbstractBinaryDump.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/AbstractTestIoManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/ClassNameManagerMock.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/TestObjectIOManagerGenericCases.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/TestObjectIOManagerSerializeCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractObjectIOTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractSerializeTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/ObjectIOBasicTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/AbstractObjectIoManagerForProxyTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/ProxyCallBackForTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyAutoSave.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyCreation.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyCreationConstructed.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyFieldReflect.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyInterceptPackageVisibility.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyInterceptPrivate.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyInterceptProtected.java
trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeBlockFile.java
trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeDual.java
trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeMultiFile.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractInserter.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractSearcher.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/ExporterBKM.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBKM.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/SearcherBKM.java
trunk/joafip-4test/src/main/java/net/sf/joafip/service/AbstractCrash.java
trunk/joafip-4test/src/main/java/net/sf/joafip/service/MainCrash.java
trunk/joafip-4test/src/main/java/net/sf/joafip/service/changelog/CheckSaved.java
trunk/joafip-example-hugemap/src/main/java/net/sf/joafip/hugemap/AbstractPersistence.java
trunk/joafip-heapfile/pom.xml
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/AbstractFileStorable.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/DataAndDataRecordIdentifier.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/HeapFileSetup.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/IFileStorable.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/AbstractHeapRBTNode.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapFreeNode.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapHeader.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapIdNode.java
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/AbstractDataRecordKeyComparator.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/AbstractHeapNodeManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.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/HeapFreeNodeManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/HeapIdNodeManager.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/AbstractFileFor.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AutoSaveHeapFileDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/FileForStorable.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileState.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IFileForStorable.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/entity/BlockDataManagerHeader.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/TestIdNode.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestAbstractFileStorable.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestDataRecordIdentifier.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestMarshall.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/AbstractTestHeapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerImpl.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerRecord.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/FileDataManagerIntegrityChecker.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/FileForStorableBridge.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapFileCheckerDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapRecordIterator.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestBlockDataManager.java
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-parent/pom.xml
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMap.java
Added Paths:
-----------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/entity/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/record/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/record/entity/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/record/service/
trunk/joafip-heapfile/src/main/java/net/sf/joafip/kvstore/service/
trunk/joafip-kvstore/.classpath
trunk/joafip-kvstore/.pmd
trunk/joafip-kvstore/.project
trunk/joafip-kvstore/.ruleset
trunk/joafip-kvstore/.settings/
trunk/joafip-kvstore/.settings/org.eclipse.core.resources.prefs
trunk/joafip-kvstore/.settings/org.eclipse.jdt.core.prefs
trunk/joafip-kvstore/.settings/org.eclipse.m2e.core.prefs
trunk/joafip-kvstore/pom.xml
trunk/joafip-kvstore/src/
trunk/joafip-kvstore/src/main/
trunk/joafip-kvstore/src/main/java/
trunk/joafip-kvstore/src/main/java/net/
trunk/joafip-kvstore/src/main/java/net/sf/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/entity/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/entity/EnumFileState.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/DataRecordIdentifier.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/IDataRecordKey.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/NullDataRecordKey.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/service/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/service/IDataRecordKeyManager.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/HeapException.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/HeapRuntimeException.java
trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/service/IHeapDataManager.java
trunk/joafip-kvstore/src/main/resources/
trunk/joafip-kvstore/src/test/
trunk/joafip-kvstore/src/test/java/
trunk/joafip-kvstore/src/test/resources/
Removed Paths:
-------------
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/EnumFileState.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordIdentifier.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/IDataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/NullDataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapException.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapRuntimeException.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IHeapDataManager.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-08 02:50:49
|
Revision: 2995
http://joafip.svn.sourceforge.net/joafip/?rev=2995&view=rev
Author: luc_peuvrier
Date: 2012-04-08 02:50:43 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
Initial import.
Added Paths:
-----------
trunk/joafip-kvstore/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-04-08 02:50:49
|
Revision: 2995
http://joafip.svn.sourceforge.net/joafip/?rev=2995&view=rev
Author: luc_peuvrier
Date: 2012-04-08 02:50:43 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
Initial import.
Added Paths:
-----------
trunk/joafip-kvstore/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-03-09 04:30:18
|
Revision: 2994
http://joafip.svn.sourceforge.net/joafip/?rev=2994&view=rev
Author: luc_peuvrier
Date: 2012-03-09 04:30:12 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
todo update
Modified Paths:
--------------
trunk/joafip/doc/_todo.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-03-09 04:30:18
|
Revision: 2994
http://joafip.svn.sourceforge.net/joafip/?rev=2994&view=rev
Author: luc_peuvrier
Date: 2012-03-09 04:30:12 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
todo update
Modified Paths:
--------------
trunk/joafip/doc/_todo.txt
Modified: trunk/joafip/doc/_todo.txt
===================================================================
--- trunk/joafip/doc/_todo.txt 2012-03-06 08:44:06 UTC (rev 2993)
+++ trunk/joafip/doc/_todo.txt 2012-03-09 04:30:12 UTC (rev 2994)
@@ -2,6 +2,11 @@
-----
major newness:
+- cut in sub projects and projects mavenized. projects are:
+ joafip,joafip-common,joafip-rbtree,joafip-heapfile,joafip-file,joafip-collection,joafip-log4j,joafip-asm,joafip-java-agent,joafip-callback,
+ joafip-jpa,
+ joafip-example-database,joafip-example-hugemap,joafip-example-simplestore
+ joafip-4test, joafip-testsuite
- improved speed in saving and reading
- use of FilePersistenceBuilder instead of "new FilePersistence(...)"
- added file management parameters
@@ -29,6 +34,7 @@
-- check private method invocation of other instance
- static field persistence feature removed because a non sense
- heap file project make able to create a map in file with a comparable key
+- new joafip-pmap project, a file persisted tree map
minor changes:
- added search last in red black tree manager
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-03-06 08:44:21
|
Revision: 2993
http://joafip.svn.sourceforge.net/joafip/?rev=2993&view=rev
Author: luc_peuvrier
Date: 2012-03-06 08:44:06 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
file tree map project added
Modified Paths:
--------------
trunk/joafip/doc/_todo.txt
trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestDataManagerHeapFile.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractDataManagerTestCase.java
trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeDual.java
trunk/joafip-4test/src/main/java/net/sf/joafip/service/changelog/CheckSaved.java
trunk/joafip-collection/src/main/java/net/sf/joafip/java/util/PTreeSubSet.java
trunk/joafip-heapfile/pom.xml
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/AbstractFileStorable.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/AbstractHeapRBTNode.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordIdentifier.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapIdNode.java
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/IDataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/NullDataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/AbstractDataRecordKeyComparator.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.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/AbstractHeapDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AutoSaveHeapFileDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IHeapDataManager.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/AbstractTestHeapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapFileCheckerDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java
trunk/joafip-pmap/pom.xml
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/entity/IRBTNode.java
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/entity/RBTSentinel.java
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/impl/memory/entity/RBTNode.java
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/service/RedBlackTree.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/AbstractTestByPosition.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/AbstractTestDelete.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestDeleteDuplicate.java
trunk/joafip-testsuite/pom.xml
trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/PersistanceTestsNoLongTests.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/redblacktree/RedBlackTreeTests.java
Added Paths:
-----------
trunk/joafip/doc/class_comment_header_lgpl.txt
trunk/joafip/doc/licences.txt
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyManager.java
trunk/joafip-pmap/src/main/java/net/
trunk/joafip-pmap/src/main/java/net/sf/
trunk/joafip-pmap/src/main/java/net/sf/joafip/
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMap.java
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMapEntrySet.java
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMapKeyMgr.java
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMapKeySet.java
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMapValues.java
trunk/joafip-pmap/src/test/java/net/
trunk/joafip-pmap/src/test/java/net/sf/
trunk/joafip-pmap/src/test/java/net/sf/joafip/
trunk/joafip-pmap/src/test/java/net/sf/joafip/pmap/
trunk/joafip-pmap/src/test/java/net/sf/joafip/pmap/TestFileTreeMap.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestIndexMultipleValue.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestIndexUniqueValue.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/pmap/
trunk/joafip-testsuite/src/main/java/net/sf/joafip/pmap/FileTreeMapTests.java
Removed Paths:
-------------
trunk/joafip/doc/class_comment_header.txt
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyComparator.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestIndex.java
Modified: trunk/joafip/doc/_todo.txt
===================================================================
--- trunk/joafip/doc/_todo.txt 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip/doc/_todo.txt 2012-03-06 08:44:06 UTC (rev 2993)
@@ -109,6 +109,9 @@
a java agent to change "new Xxx" to call to newInstance proxied object factory for auto save
+sub set/map/list
+- add/check test contains, remove, add must failed if not in range
+
collection apache and google
BlockDataManger
Deleted: trunk/joafip/doc/class_comment_header.txt
===================================================================
--- trunk/joafip/doc/class_comment_header.txt 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip/doc/class_comment_header.txt 2012-03-06 08:44:06 UTC (rev 2993)
@@ -1,22 +0,0 @@
-/*
- * Copyright 2011 Luc Peuvrier
- *
- * This file is a part of JOAFIP.
- *
- * JOAFIP is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License.
- *
- * 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
- *
- * JOAFIP is distributed in the hope that it will be useful, but
- * 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.
- */
Copied: trunk/joafip/doc/class_comment_header_lgpl.txt (from rev 2989, trunk/joafip/doc/class_comment_header.txt)
===================================================================
--- trunk/joafip/doc/class_comment_header_lgpl.txt (rev 0)
+++ trunk/joafip/doc/class_comment_header_lgpl.txt 2012-03-06 08:44:06 UTC (rev 2993)
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * 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
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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.
+ */
Added: trunk/joafip/doc/licences.txt
===================================================================
--- trunk/joafip/doc/licences.txt (rev 0)
+++ trunk/joafip/doc/licences.txt 2012-03-06 08:44:06 UTC (rev 2993)
@@ -0,0 +1,124 @@
+LGPL:
+-----
+
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * 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
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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.
+ */
+
+APACHE:
+-------
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+
+ 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.
+
+A LESS RESTRICTIVE LICENCE (asm objectweb)
+------------------------------------------
+
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (the "LGPL License");
+ * you may not use this file except in compliance with the "LGPL License" extended with here below additional permissions.
+ * You may obtain a copy of the "LGPL License" at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Additional permissions extensions for this file:
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted under the the Apache License, Version 2.0 (the "Apache License") instead of the "LGPL License"
+ * and if following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * You may obtain a copy of the "Apache License" at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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.
+ */
+
+
+Copyright (c) 2007-2012 Luc Peuvrier
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
\ No newline at end of file
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -410,6 +410,16 @@
}
@Override
+ public void setIndex(final int index) {
+ node.setIndex(index);
+ }
+
+ @Override
+ public int getIndex() {
+ return node.getIndex();
+ }
+
+ @Override
public void decrementNumberOfChild() throws RBTException {
node.decrementNumberOfChild();
try {
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -128,7 +128,7 @@
if (useCacheMode) {
setup.cacheSetup(pageSize, maxPage);
}
- this.dataManager = new HeapFileDataManager(setup);
+ this.dataManager = new HeapFileDataManager(setup, false);
} catch (HeapException exception) {
logger.fatal(CREATION_FAILED, exception);
throw new StoreException(CREATION_FAILED, exception);
Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -60,7 +60,7 @@
1/* maxFileOperationRetry */, 0/* fileOperationRetryMsDelay */,
null/* openFileTraceFile */);
setup.cacheSetup(1024/* pageSize */, 1024/* maxPage */);
- heapDataManagerForSet = new AutoSaveHeapFileDataManager(setup,
+ heapDataManagerForSet = new AutoSaveHeapFileDataManager(setup, false,
MAX_RECORDS);
minusOne = longToBinary(-1);
}
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestDataManagerHeapFile.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestDataManagerHeapFile.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestDataManagerHeapFile.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -54,7 +54,7 @@
/**/false/* delete renaming */, false/* clearResizeFile */, 1, 0,
/**/openFileTraceFile);
setup.cacheSetup(16 * 1024, 100);
- dataManager = new HeapFileDataManager(setup);
+ dataManager = new HeapFileDataManager(setup, false);
super.setUp();
}
}
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -75,6 +75,7 @@
builder.setCrashSafeMode(false);
filePersistence = (FilePersistence) builder.build();
joafipMutex = filePersistence.getMutex();
+ filePersistence.addToNotCheckMethod(Bob1.class);
}
@Override
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractDataManagerTestCase.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractDataManagerTestCase.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractDataManagerTestCase.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -65,7 +65,7 @@
+ "/backup.ok"),
/**/new File(TestConstant.getWinRamDiskRuntimeDir()
+ "/global.ok"));
- dataManager = new HeapFileDataManager(setup);
+ dataManager = new HeapFileDataManager(setup, false);
dataManager.startService(true);
} catch (HeapException exception) {
if (dataManager == null) {
Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeDual.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeDual.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeDual.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -61,7 +61,8 @@
false/* clearResizeFile */, 0/* maxFileOperationRetry */,
0/* fileOperationRetryMsDelay */, new File(
"runtime/openFileTraceFile.txt"));
- final IHeapDataManager fileDataManager = new HeapFileDataManager(setup);
+ final IHeapDataManager fileDataManager = new HeapFileDataManager(setup,
+ false);
builder.setDataManager(new DualWrapDataManager(fileDataManager,
blockDataManager));
Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/service/changelog/CheckSaved.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/service/changelog/CheckSaved.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/service/changelog/CheckSaved.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -57,7 +57,7 @@
final File dataFile = new File(storageFileName);
final HeapFileSetup setup = new HeapFileSetup(dataFile, false,
false, false, false, 1, 0, null);
- dataManager = new HeapFileDataManager(setup);
+ dataManager = new HeapFileDataManager(setup, false);
final HeapRecordableManager heapRecordableManager = new HeapRecordableManager(
dataManager);
final HelperBinaryConversion helperBinaryConversion = new HelperBinaryConversion();
Modified: trunk/joafip-collection/src/main/java/net/sf/joafip/java/util/PTreeSubSet.java
===================================================================
--- trunk/joafip-collection/src/main/java/net/sf/joafip/java/util/PTreeSubSet.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-collection/src/main/java/net/sf/joafip/java/util/PTreeSubSet.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -134,12 +134,24 @@
}
}
if (outOfRange) {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException("element out of range");
}
return super.add(element);
}
+ // FIXMELUC ____________must be override
@Override
+ public boolean contains(final Object object) {// NOPMD
+ return super.contains(object);
+ }
+
+ // FIXMELUC ____________must be override
+ @Override
+ public boolean remove(final Object object) {// NOPMD
+ return super.remove(object);
+ }
+
+ @Override
public ListIterator<E> listIterator() {
return treeSupport.iterator(fromElement, fromInclusive, toElement,
toInclusive);
Modified: trunk/joafip-heapfile/pom.xml
===================================================================
--- trunk/joafip-heapfile/pom.xml 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/pom.xml 2012-03-06 08:44:06 UTC (rev 2993)
@@ -35,6 +35,14 @@
<dependency>
<groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-collection</artifactId>
+ <version>4.0.0b8</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
<artifactId>joafip-file</artifactId>
<version>4.0.0b8</version>
</dependency>
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/AbstractFileStorable.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/AbstractFileStorable.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/AbstractFileStorable.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -16,6 +16,8 @@
*/
package net.sf.joafip.heapfile.entity;
+import java.util.Arrays;
+
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.heapfile.service.FileForStorable;
import net.sf.joafip.heapfile.service.HeapException;
@@ -67,6 +69,8 @@
/** input output buffer */
private transient byte[] ioBuffer;
+ private transient int readInIoBuffer;
+
/**
* true if this value changed, creation implies no value to save since not
* read and not write
@@ -223,12 +227,33 @@
protected int readFileToIoBuffer(final int size) throws HeapException {
ioBuffer = new byte[size];
- final int readInIoBuffer = fileForStorable.read(ioBuffer);
+ readInIoBuffer = fileForStorable.read(ioBuffer);
numberOfByteReadWrote = 0;
return readInIoBuffer;
}
/**
+ * read extending ioBuffer
+ *
+ * @param newSize
+ * ioBuffer new size
+ * @throws HeapException
+ */
+ protected void readFileAppendToIoBuffer(final int newSize)
+ throws HeapException {
+ if (newSize > ioBuffer.length) {
+ ioBuffer = Arrays.copyOf(ioBuffer, newSize);
+ final int appendSize = newSize - readInIoBuffer;
+ final byte[] tempBuffer = new byte[appendSize];
+ // FIXMELUC _________________use of additional read
+ // read(iobuffer,readInIoBuffer/*offset*/,appendSize/*length*/);
+ fileForStorable.read(tempBuffer);
+ System.arraycopy(tempBuffer, 0, ioBuffer, readInIoBuffer,
+ appendSize);
+ }
+ }
+
+ /**
* read and check CRC32
*
* @throws HeapException
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/AbstractHeapRBTNode.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/AbstractHeapRBTNode.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/AbstractHeapRBTNode.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -92,6 +92,8 @@
*/
public int numberOfChild = 0;
+ public int index;
+
/**
* heap elements manager for access to {@link HeapRecord}, null for sentinel
* node
@@ -437,6 +439,16 @@
}
@Override
+ public void setIndex(final int index) {
+ this.index = index;
+ }
+
+ @Override
+ public int getIndex() {
+ return index;
+ }
+
+ @Override
public void decrementNumberOfChild() throws RBTException {
numberOfChild--;
heapRecordValueIsChanged(true);
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordIdentifier.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordIdentifier.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordIdentifier.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -45,6 +45,8 @@
private final IDataRecordKey dataRecordKey;
+ private int index;
+
/**
* create the first data record identifier: #0
*
@@ -114,6 +116,18 @@
return dataRecordKey.getKeyData();
}
+ public Object getKey() throws HeapException {
+ return dataRecordKey.getKey();
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(final int index) {
+ this.index = index;
+ }
+
public int compareTo(final DataRecordIdentifier dataRecordIdentifier) {
final int compareTo;
final long otherLong1 = dataRecordIdentifier.value;
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -23,7 +23,7 @@
package net.sf.joafip.heapfile.record.entity;
import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.service.IDataRecordKeyComparator;
+import net.sf.joafip.heapfile.record.service.IDataRecordKeyManager;
import net.sf.joafip.heapfile.service.HeapException;
/**
@@ -34,16 +34,16 @@
@NotStorableClass
public class DataRecordKey implements IDataRecordKey {
- private final IDataRecordKeyComparator comparator;
+ private final IDataRecordKeyManager dataRecordKeyManager;
private final byte[] data;
private transient Object key;
- public DataRecordKey(final IDataRecordKeyComparator comparator,
+ public DataRecordKey(final IDataRecordKeyManager dataRecordKeyManager,
final byte[] data) {// NOPMD
super();
- this.comparator = comparator;
+ this.dataRecordKeyManager = dataRecordKeyManager;
this.data = data;
}
@@ -55,7 +55,7 @@
@Override
public int compareTo(final IDataRecordKey dataRecordKey)
throws HeapException {
- return comparator.compareDataRecordKey(this, dataRecordKey);
+ return dataRecordKeyManager.compareDataRecordKey(this, dataRecordKey);
}
@Override
@@ -69,11 +69,13 @@
}
@Override
- public Object getKey() {
+ public Object getKey() throws HeapException {
+ if (key == null) {
+ key = dataRecordKeyManager.unmarshall(data);
+ }
return key;
}
- @Override
public void setKey(final Object key) {
this.key = key;
}
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapIdNode.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapIdNode.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapIdNode.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -59,6 +59,7 @@
}
public DataRecordIdentifier getElement() {
+ nodeIdentifier.setIndex(index);
return nodeIdentifier;
}
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-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -92,9 +92,10 @@
/**/COMMON_FOR_HEADER_SIZE + 4 + 3 * 8 + 1 + 4 + 8;
@SuppressWarnings("all")
+ // add 4 to DATA_RECORD_HEADER_SIZE for key data length storage
public static final int MAX_RECORD_HEADER_SIZE =
- /**/DATA_RECORD_HEADER_SIZE > FREE_RECORD_HEADER_SIZE ?
- /**/DATA_RECORD_HEADER_SIZE
+ /**/(DATA_RECORD_HEADER_SIZE + 4) > FREE_RECORD_HEADER_SIZE ?
+ /**/(DATA_RECORD_HEADER_SIZE + 4)
/**/: FREE_RECORD_HEADER_SIZE;
/**
@@ -131,6 +132,8 @@
/** the area size in file ( record header size + data size ) */
private Integer areaSize;
+ private int dataRecordHeaderSize;
+
/** data size of data associated to this record, null if free data area */
private Integer dataAssociatedSize;
@@ -189,13 +192,6 @@
assert assertAreaSizeForData(freeRecord, nodeIdentifier,
dataAssociatedSize, areaSize);
this.areaSize = areaSize;
- // if (freeRecord) {
- // freeNode = new HeapFreeNode(heapElementManager, positionInFile,
- // areaSize);
- // } else {
- // idNode = new HeapIdNode(heapElementManager, positionInFile,
- // nodeIdentifier);
- // }
this.nodeIdentifier = nodeIdentifier;
clearNodeData();
// ASSERTX
@@ -206,9 +202,11 @@
final DataRecordIdentifier nodeIdentifier,
final Integer dataAssociatedSize, final Integer areaSize)
throws HeapException {
+ // if (!freeRecord && areaSize != null
+ // && areaSize < MAX_RECORD_HEADER_SIZE + dataAssociatedSize + 4) {
if (!freeRecord
&& areaSize != null
- && areaSize < MAX_RECORD_HEADER_SIZE
+ && areaSize < DATA_RECORD_HEADER_SIZE
+ nodeIdentifier.getKeyDataSize() + dataAssociatedSize
+ 4) {
logger.fatal(AREA_SIZE_TO_SMALL_FOR_DATA);
@@ -272,8 +270,6 @@
dataAssociated = null;// NOPMD no more data
dataAssociatedSize = null;// NOPMD no more data
idNode = null;// NOPMD no more data
- // freeNode = new HeapFreeNode(heapElementManager, positionInFile,
- // areaSize);
clearNodeData();
}
@@ -327,8 +323,6 @@
final DataRecordIdentifier nodeIdentifier) {
freeRecord = false;
freeNode = null;// NOPMD no more free
- // idNode = new HeapIdNode(heapElementManager, positionInFile,
- // nodeIdentifier);
this.nodeIdentifier = nodeIdentifier;
this.dataAssociatedSize = dataAssociatedSize;
clearNodeData();
@@ -345,7 +339,12 @@
toMarshallSize = areaSize;
} else {
// only header will be write
- toMarshallSize = DATA_RECORD_HEADER_SIZE;
+ final byte[] keyData = nodeIdentifier.getKeyData();
+ if (keyData == null) {
+ toMarshallSize = DATA_RECORD_HEADER_SIZE;
+ } else {
+ toMarshallSize = DATA_RECORD_HEADER_SIZE + keyData.length + 4;
+ }
}
return toMarshallSize;
}
@@ -501,15 +500,10 @@
// ASSERTX
assert read >= FREE_RECORD_HEADER_SIZE : "expected a minimum of "
+ FREE_RECORD_HEADER_SIZE + " but read " + read;
- // idNode = null;// NOPMD have no id node
- // freeNode = new HeapFreeNode(heapElementManager, positionInFile,
- // areaSize);
} else {
// ASSERTX
assert read >= DATA_RECORD_HEADER_SIZE : "expected a minimum of "
+ DATA_RECORD_HEADER_SIZE + " but read " + read;
- // freeNode = null;// NOPMD have no free node
- // idNode = new HeapIdNode(heapElementManager, positionInFile);
}
try {
if (freeRecord) {
@@ -549,11 +543,14 @@
final long long1 = readLong();
if (long1 == -1) {
final int keySize = readInteger();
+ dataRecordHeaderSize = DATA_RECORD_HEADER_SIZE + 4 + keySize;
+ readFileAppendToIoBuffer(dataRecordHeaderSize);
final byte[] keyData = readBytes(keySize);
final IDataRecordKey dataRecordKey = new DataRecordKey(
- heapElementManager.getDataRecordKeyComparator(), keyData);
+ heapElementManager.getDataRecordKeyManager(), keyData);
nodeIdentifier = new DataRecordIdentifier(dataRecordKey);
} else {
+ dataRecordHeaderSize = DATA_RECORD_HEADER_SIZE;
nodeIdentifier = new DataRecordIdentifier(long1);
}
readAndCheckCrc32();
@@ -754,7 +751,8 @@
private void readData() throws HeapException {
// ASSERTX
assert headerRead : "can not read data if header not read";
- fileForStorable.seek(positionInFile + DATA_RECORD_HEADER_SIZE);
+ fileForStorable
+ .seek(positionInFile + dataRecordHeaderSize/* DATA_RECORD_HEADER_SIZE */);
unmarshallDataArea();
}
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/IDataRecordKey.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/IDataRecordKey.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/IDataRecordKey.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -39,7 +39,5 @@
byte[] getKeyData();
- Object getKey();
-
- void setKey(Object key);
+ Object getKey() throws HeapException;
}
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/NullDataRecordKey.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/NullDataRecordKey.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/NullDataRecordKey.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -75,8 +75,8 @@
return null;
}
- @Override
- public void setKey(final Object key) {
- // no implementation
- }
+ // @Override
+ // public void setKey(final Object key) {
+ // // no implementation
+ // }
}
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/AbstractDataRecordKeyComparator.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/AbstractDataRecordKeyComparator.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/AbstractDataRecordKeyComparator.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -22,6 +22,8 @@
*/
package net.sf.joafip.heapfile.record.service;
+import java.util.Comparator;
+
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.heapfile.record.entity.IDataRecordKey;
import net.sf.joafip.heapfile.service.HeapException;
@@ -34,27 +36,23 @@
*/
@NotStorableClass
public abstract class AbstractDataRecordKeyComparator<K extends Comparable<K>>
- implements IDataRecordKeyComparator {
+ implements IDataRecordKeyManager {
+ private final Comparator<? super K> comparator;
+
+ public AbstractDataRecordKeyComparator(
+ final Comparator<? super K> comparator) {
+ super();
+ this.comparator = comparator;
+ }
+
+ @SuppressWarnings("unchecked")
@Override
public int compareDataRecordKey(final IDataRecordKey dataRecordKey1,
final IDataRecordKey dataRecordKey2) throws HeapException {
- final K key1 = getObject(dataRecordKey1);
- final K key2 = getObject(dataRecordKey2);
- return key1.compareTo(key2);
+ final K key1 = (K) dataRecordKey1.getKey();
+ final K key2 = (K) dataRecordKey2.getKey();
+ return comparator == null ? key1.compareTo(key2) : comparator.compare(
+ key1, key2);
}
-
- @SuppressWarnings("unchecked")
- private K getObject(final IDataRecordKey dataRecordKey)
- throws HeapException {
- K key = (K) dataRecordKey.getKey();
- if (key == null) {
- key = unmarshall(dataRecordKey.getKeyData());
- dataRecordKey.setKey(key);
- }
- return key;
- }
-
- protected abstract K unmarshall(byte[] keyData) throws HeapException;
-
}
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -26,6 +26,7 @@
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.util.Comparator;
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
@@ -39,7 +40,7 @@
*/
@NotStorableClass
@SuppressWarnings("rawtypes")
-public final class DataRecordKeyManager extends AbstractDataRecordKeyComparator {
+public class DataRecordKeyManager extends AbstractDataRecordKeyComparator {
private static final DataRecordKeyManager INSTANCE = new DataRecordKeyManager();
@@ -47,13 +48,18 @@
return INSTANCE;
}
+ @SuppressWarnings("unchecked")
private DataRecordKeyManager() {
- super();
+ super(null);
}
+ @SuppressWarnings("unchecked")
+ protected DataRecordKeyManager(final Comparator comparator) {
+ super(comparator);
+ }
+
@Override
- protected Comparable<?> unmarshall(final byte[] keyData)
- throws HeapException {
+ public Comparable<?> unmarshall(final byte[] keyData) throws HeapException {
try {
final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(
keyData);
@@ -67,6 +73,7 @@
}
}
+ @Override
public DataRecordIdentifier createKey(final Object key)
throws HeapException {
try {
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-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/HeapElementManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -219,7 +219,7 @@
private final int fileOperationRetryMsDelay;
- private IDataRecordKeyComparator dataRecordKeyComparator;
+ private IDataRecordKeyManager dataRecordKeyManager;
/**
* construction for crash safe mode disabled<br>
@@ -1190,13 +1190,13 @@
}
@Override
- public void setDataRecordKeyComparator(
- final IDataRecordKeyComparator dataRecordKeyComparator) {
- this.dataRecordKeyComparator = dataRecordKeyComparator;
+ public void setDataRecordKeyManager(
+ final IDataRecordKeyManager dataRecordKeyManager) {
+ this.dataRecordKeyManager = dataRecordKeyManager;
}
@Override
- public IDataRecordKeyComparator getDataRecordKeyComparator() {
- return dataRecordKeyComparator;
+ public IDataRecordKeyManager getDataRecordKeyManager() {
+ return dataRecordKeyManager;
}
}
Deleted: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyComparator.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyComparator.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyComparator.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -1,37 +0,0 @@
-/*
- * Copyright 2012 Luc Peuvrier
- *
- * This file is a part of JOAFIP.
- *
- * JOAFIP is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License.
- *
- * 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
- *
- * JOAFIP is distributed in the hope that it will be useful, but
- * 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.record.service;
-
-import net.sf.joafip.heapfile.record.entity.IDataRecordKey;
-import net.sf.joafip.heapfile.service.HeapException;
-
-/**
- *
- * @author luc peuvrier
- *
- */
-public interface IDataRecordKeyComparator {
-
- int compareDataRecordKey(IDataRecordKey dataRecordKey1,
- IDataRecordKey dataRecordKey2) throws HeapException;
-}
Copied: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyManager.java (from rev 2988, trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyComparator.java)
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyManager.java (rev 0)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * 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
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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.record.service;
+
+import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
+import net.sf.joafip.heapfile.record.entity.IDataRecordKey;
+import net.sf.joafip.heapfile.service.HeapException;
+
+/**
+ *
+ * @author luc peuvrier
+ *
+ */
+public interface IDataRecordKeyManager {
+
+ int compareDataRecordKey(IDataRecordKey dataRecordKey1,
+ IDataRecordKey dataRecordKey2) throws HeapException;
+
+ Comparable<?> unmarshall(byte[] keyData) throws HeapException;
+
+ DataRecordIdentifier createKey(Object key) throws HeapException;
+}
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-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IHeapElementManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -208,8 +208,7 @@
int getNumberOfHeaprecordInMemory();
- void setDataRecordKeyComparator(
- IDataRecordKeyComparator dataRecordKeyComparator);
+ void setDataRecordKeyManager(IDataRecordKeyManager dataRecordKeyComparator);
- IDataRecordKeyComparator getDataRecordKeyComparator();
+ IDataRecordKeyManager getDataRecordKeyManager();
}
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AbstractHeapDataManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -33,6 +33,8 @@
public abstract class AbstractHeapDataManager implements IHeapDataManager,
Serializable {
+ private static final String UNSUPPORTED_OPERATION = "unsupported operation";
+
/**
*
*/
@@ -371,6 +373,139 @@
throws HeapException;
@Override
+ public DataRecordIdentifier firstDataRecordIdentifier()
+ throws HeapException {
+ try {
+ // ASSERTX
+ assert assertStarted();
+ return firstDataRecordIdentifierImpl();
+ } catch (HeapException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ } catch (RuntimeException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ }
+ }
+
+ protected DataRecordIdentifier firstDataRecordIdentifierImpl()
+ throws HeapException {
+ throw new HeapException(UNSUPPORTED_OPERATION);
+ }
+
+ @Override
+ public DataRecordIdentifier lastDataRecordIdentifier() throws HeapException {
+ try {
+ // ASSERTX
+ assert assertStarted();
+ return lastDataRecordIdentifierImpl();
+ } catch (HeapException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ } catch (RuntimeException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ }
+ }
+
+ protected DataRecordIdentifier lastDataRecordIdentifierImpl()
+ throws HeapException {
+ throw new HeapException(UNSUPPORTED_OPERATION);
+ }
+
+ @Override
+ public DataRecordIdentifier lowerDataRecordIdentifier(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ try {
+ // ASSERTX
+ assert assertStarted();
+ return lowerDataRecordIdentifierImpl(dataRecordIdentifier);
+ } catch (HeapException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ } catch (RuntimeException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ }
+ }
+
+ protected DataRecordIdentifier lowerDataRecordIdentifierImpl(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ throw new HeapException(UNSUPPORTED_OPERATION);
+ }
+
+ @Override
+ public DataRecordIdentifier floorDataRecordIdentifier(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ try {
+ // ASSERTX
+ assert assertStarted();
+ return floorDataRecordIdentifierImpl(dataRecordIdentifier);
+ } catch (HeapException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ } catch (RuntimeException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ }
+ }
+
+ protected DataRecordIdentifier floorDataRecordIdentifierImpl(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ throw new HeapException(UNSUPPORTED_OPERATION);
+ }
+
+ @Override
+ public DataRecordIdentifier ceilingDataRecordIdentifier(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ try {
+ // ASSERTX
+ assert assertStarted();
+ return ceilingDataRecordIdentifierImpl(dataRecordIdentifier);
+ } catch (HeapException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ } catch (RuntimeException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ }
+ }
+
+ protected DataRecordIdentifier ceilingDataRecordIdentifierImpl(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ throw new HeapException(UNSUPPORTED_OPERATION);
+ }
+
+ @Override
+ public DataRecordIdentifier higherDataRecordIdentifier(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ try {
+ // ASSERTX
+ assert assertStarted();
+ return higherDataRecordIdentifierImpl(dataRecordIdentifier);
+ } catch (HeapException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ } catch (RuntimeException exception) {
+ closeHeapManagerAfterException();
+ throw exception;
+ }
+ }
+
+ protected DataRecordIdentifier higherDataRecordIdentifierImpl(
+ final DataRecordIdentifier dataRecordIdentifier)
+ throws HeapException {
+ throw new HeapException(UNSUPPORTED_OPERATION);
+ }
+
+ @Override
public DataRecordIdentifier removeFirstDataRecord() throws HeapException {
// ASSERTX
try {
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AutoSaveHeapFileDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AutoSaveHeapFileDataManager.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AutoSaveHeapFileDataManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -42,8 +42,9 @@
private final int maxRecord;
public AutoSaveHeapFileDataManager(final HeapFileSetup setup,
- final int maxRecord) throws HeapException {
- super(setup);
+ final boolean manageNodeIndex, final int maxRecord)
+ throws HeapException {
+ super(setup, manageNodeIndex);
this.maxRecord = maxRecord;
}
@@ -98,5 +99,4 @@
flushImp();
}
}
-
}
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-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -37,7 +37,7 @@
import net.sf.joafip.heapfile.record.service.HeapElementManager;
import net.sf.joafip.heapfile.record.service.HeapFreeNodeManager;
import net.sf.joafip.heapfile.record.service.HeapIdNodeManager;
-import net.sf.joafip.heapfile.record.service.IDataRecordKeyComparator;
+import net.sf.joafip.heapfile.record.service.IDataRecordKeyManager;
import net.sf.joafip.heapfile.record.service.IHeapElementManager;
import net.sf.joafip.redblacktree.entity.IRBTNode;
import net.sf.joafip.redblacktree.service.IRBTVisitor;
@@ -55,6 +55,8 @@
// FIXMELUC ______HeapFileDataManager not accept empty data
+ private static final String IDENTIFIER2 = ", identifier=";
+
/**
*
*/
@@ -129,7 +131,8 @@
/** file name for backup logging */
private String backupFileName;
- public HeapFileDataManager(final HeapFileSetup setup) throws HeapException {
+ public HeapFileDataManager(final HeapFileSetup setup,
+ final boolean manageNodeIndex) throws HeapException {
super();
final boolean deleteRenaming = setup.isDeleteRenaming();
final boolean clearResizeFile = setup.isClearResizeFile();
@@ -193,7 +196,7 @@
final HeapIdNodeManager heapIdNodeManager = new HeapIdNodeManager(
heapElementManager);
idNodeTree = new RedBlackTree<DataRecordIdentifier>(heapIdNodeManager,
- false, true);
+ manageNodeIndex, true);
if (crashSafeMode && heapElementManager.wasBadFileStableState()) {
logger.warn(RESTART_FROM_STABLE_BACKUP);
/* validate the stable state */
@@ -637,8 +640,8 @@
try {
heapIdNode = (HeapIdNode) idNodeTree.search(identifier);
} catch (RBTException e) {
- final String message = SEARCH_FOR_IDENTIFIER_FAILED
- + ", identifier=" + identifier;
+ final String message = SEARCH_FOR_IDENTIFIER_FAILED + IDENTIFIER2
+ + identifier;
logger.fatal(message);
throw new HeapException(message, e);
}
@@ -822,6 +825,94 @@
return haveDataRecord;
}
+ @Override
+ protected DataRecordIdentifier firstDataRecordIdentifierImpl()
+ throws HeapException {
+ try {
+ final HeapIdNode firstHeapIdNode = (HeapIdNode) idNodeTree.first();
+ return firstHeapIdNode == null ? null : firstHeapIdNode
+ .getElement();
+ } catch (RBTException exception) {
+ final String message = "failed get first node";
+ logger.fatal(message);
+ throw new HeapException(message, exception);
+ }
+ }
+
+ @Override
+ protected DataRecordIdentifier lastDataRecordIdentifierImpl()
+ throws HeapException {
+ try {
+ final HeapIdNode firstHeapIdNode = (HeapIdNode) idNodeTree.last();
+ return firstHeapIdNode == null ? null : firstHeapIdNode
+ .getElement();
+ } catch (RBTException exception) {
+ final String message = "failed get first node";
+ logger.fatal(message);
+ throw new HeapException(message, exception);
+ }
+ }
+
+ @Override
+ protected DataRecordIdentifier lowerDataRecordIdentifierImpl(
+ final DataRecordIdentifier identifier) throws HeapException {
+ try {
+ final HeapIdNode heapIdNode = (HeapIdNode) idNodeTree
+ .strictlyLess(identifier);
+ return heapIdNode == null ? null : heapIdNode.getElement();
+ } catch (RBTException e) {
+ final String message = SEARCH_FOR_IDENTIFIER_FAILED + IDENTIFIER2
+ + identifier;
+ logger.fatal(message);
+ throw new HeapException(message, e);
+ }
+ }
+
+ @Override
+ protected DataRecordIdentifier floorDataRecordIdentifierImpl(
+ final DataRecordIdentifier identifier) throws HeapException {
+ try {
+ final HeapIdNode heapIdNode = (HeapIdNode) idNodeTree
+ .closestLessOrEqual(identifier);
+ return heapIdNode == null ? null : heapIdNode.getElement();
+ } catch (RBTException e) {
+ final String message = SEARCH_FOR_IDENTIFIER_FAILED + IDENTIFIER2
+ + identifier;
+ logger.fatal(message);
+ throw new HeapException(message, e);
+ }
+ }
+
+ @Override
+ protected DataRecordIdentifier ceilingDataRecordIdentifierImpl(
+ final DataRecordIdentifier identifier) throws HeapException {
+ try {
+ final HeapIdNode heapIdNode = (HeapIdNode) idNodeTree
+ .closestGreaterOrEqual(identifier);
+ return heapIdNode == null ? null : heapIdNode.getElement();
+ } catch (RBTException e) {
+ final String message = SEARCH_FOR_IDENTIFIER_FAILED + IDENTIFIER2
+ + identifier;
+ logger.fatal(message);
+ throw new HeapException(message, e);
+ }
+ }
+
+ @Override
+ protected DataRecordIdentifier higherDataRecordIdentifierImpl(
+ final DataRecordIdentifier identifier) throws HeapException {
+ try {
+ final HeapIdNode heapIdNode = (HeapIdNode) idNodeTree
+ .strictlyGreater(identifier);
+ return heapIdNode == null ? null : heapIdNode.getElement();
+ } catch (RBTException e) {
+ final String message = SEARCH_FOR_IDENTIFIER_FAILED + IDENTIFIER2
+ + identifier;
+ logger.fatal(message);
+ throw new HeapException(message, e);
+ }
+ }
+
/**
* To obtain a free record for an area size<br>
* The free record obtained may have greater area size than size asked for<br>
@@ -1126,8 +1217,8 @@
@Override
public void setDataRecordKeyComparator(
- final IDataRecordKeyComparator dataRecordKeyComparator) {
- heapElementManager.setDataRecordKeyComparator(dataRecordKeyComparator);
+ final IDataRecordKeyManager dataRecordKeyComparator) {
+ heapElementManager.setDataRecordKeyManager(dataRecordKeyComparator);
}
/**
Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IHeapDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IHeapDataManager.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IHeapDataManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -21,7 +21,7 @@
import net.sf.joafip.Fortest;
import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
-import net.sf.joafip.heapfile.record.service.IDataRecordKeyComparator;
+import net.sf.joafip.heapfile.record.service.IDataRecordKeyManager;
/**
* data management on heap file<br>
@@ -170,6 +170,64 @@
throws HeapException;
/**
+ *
+ * @return first data record identifier, null if none (heap empty)
+ * @throws HeapException
+ */
+ DataRecordIdentifier firstDataRecordIdentifier() throws HeapException;
+
+ /**
+ *
+ * @return last data record identifier, null if none (heap empty)
+ * @throws HeapException
+ */
+ DataRecordIdentifier lastDataRecordIdentifier() throws HeapException;
+
+ /**
+ *
+ * @param dataRecordIdentifier
+ * the key
+ * @return the greatest key strictly less than the given key, or
+ * {@code null} if there is no such key.
+ * @throws HeapException
+ */
+ DataRecordIdentifier lowerDataRecordIdentifier(
+ DataRecordIdentifier dataRecordIdentifier) throws HeapException;
+
+ /**
+ *
+ * @param dataRecordIdentifier
+ * the key
+ * @return the greatest key less than or equal to {@code key}, or
+ * {@code null} if there is no such key
+ * @throws HeapException
+ */
+ DataRecordIdentifier floorDataRecordIdentifier(
+ DataRecordIdentifier dataRecordIdentifier) throws HeapException;
+
+ /**
+ *
+ * @param dataRecordIdentifier
+ * the key
+ * @return a key with the least key greater than or equal to {@code key}, or
+ * {@code null} if there is no such key
+ * @throws HeapException
+ */
+ DataRecordIdentifier ceilingDataRecordIdentifier(
+ DataRecordIdentifier dataRecordIdentifier) throws HeapException;
+
+ /**
+ *
+ * @param dataRecordIdentifier
+ * the key
+ * @return the least key greater than {@code key}, or {@code null} if there
+ * is no such key
+ * @throws HeapException
+ */
+ DataRecordIdentifier higherDataRecordIdentifier(
+ DataRecordIdentifier dataRecordIdentifier) throws HeapException;
+
+ /**
* remove first data record and return its data record identifier.<br>
* {@link #flush()} must be call to store the modification.<br>
* service must be started.
@@ -295,5 +353,5 @@
long getLastRecordPositionInFile() throws HeapException;
void setDataRecordKeyComparator(
- IDataRecordKeyComparator dataRecordKeyComparator);
+ IDataRecordKeyManager dataRecordKeyComparator);
}
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-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestStoreRestore.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -332,13 +332,13 @@
}
@Override
- public void setDataRecordKeyComparator(
- final IDataRecordKeyComparator dataRecordKeyComparator) {
+ public void setDataRecordKeyManager(
+ final IDataRecordKeyManager dataRecordKeyComparator) {
throw new UnsupportedOperationException("not implemented");
}
@Override
- public IDataRecordKeyComparator getDataRecordKeyComparator() {
+ public IDataRecordKeyManager getDataRecordKeyManager() {
throw new UnsupportedOperationException("not implemented");
}
}
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManager.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -124,7 +124,7 @@
openFileTraceFile);
setup.crashSafeSetup(backupFile, stateDataFile, stateDataBackupFile,
globalStateFile);
- heapDataManager = new HeapFileDataManager(setup);
+ heapDataManager = new HeapFileDataManager(setup, false);
heapDataManager.startService(removeFile);
}
Modified: trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java
===================================================================
--- trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java 2012-03-03 02:24:47 UTC (rev 2992)
+++ trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java 2012-03-06 08:44:06 UTC (rev 2993)
@@ -36,7 +36,7 @@
import net.sf.joafi...
[truncated message content] |
|
From: <luc...@us...> - 2012-03-06 08:44:19
|
Revision: 2993
http://joafip.svn.sourceforge.net/joafip/?rev=2993&view=rev
Author: luc_peuvrier
Date: 2012-03-06 08:44:06 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
file tree map project added
Modified Paths:
--------------
trunk/joafip/doc/_todo.txt
trunk/joafip/src/main/java/net/sf/joafip/store/entity/heaprecordable/AbstractHeapRecordableRBTNode.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/AbstractStoreDelegatingToDataManager.java
trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestDataManagerHeapFile.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractDataManagerTestCase.java
trunk/joafip-4test/src/main/java/net/sf/joafip/bugtree/MainTreeDual.java
trunk/joafip-4test/src/main/java/net/sf/joafip/service/changelog/CheckSaved.java
trunk/joafip-collection/src/main/java/net/sf/joafip/java/util/PTreeSubSet.java
trunk/joafip-heapfile/pom.xml
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/entity/AbstractFileStorable.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/AbstractHeapRBTNode.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordIdentifier.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapIdNode.java
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/IDataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/NullDataRecordKey.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/AbstractDataRecordKeyComparator.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.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/AbstractHeapDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/AutoSaveHeapFileDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/HeapFileDataManager.java
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/service/IHeapDataManager.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/AbstractTestHeapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/BlockDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/DualWrapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapFileCheckerDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMemoryDataManagerMock.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/HeapMultiFileDataManager.java
trunk/joafip-pmap/pom.xml
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/entity/IRBTNode.java
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/entity/RBTSentinel.java
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/impl/memory/entity/RBTNode.java
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/service/RedBlackTree.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/AbstractTestByPosition.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/AbstractTestDelete.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestDeleteDuplicate.java
trunk/joafip-testsuite/pom.xml
trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/PersistanceTestsNoLongTests.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/redblacktree/RedBlackTreeTests.java
Added Paths:
-----------
trunk/joafip/doc/class_comment_header_lgpl.txt
trunk/joafip/doc/licences.txt
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyManager.java
trunk/joafip-pmap/src/main/java/net/
trunk/joafip-pmap/src/main/java/net/sf/
trunk/joafip-pmap/src/main/java/net/sf/joafip/
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMap.java
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMapEntrySet.java
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMapKeyMgr.java
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMapKeySet.java
trunk/joafip-pmap/src/main/java/net/sf/joafip/pmap/FileTreeMapValues.java
trunk/joafip-pmap/src/test/java/net/
trunk/joafip-pmap/src/test/java/net/sf/
trunk/joafip-pmap/src/test/java/net/sf/joafip/
trunk/joafip-pmap/src/test/java/net/sf/joafip/pmap/
trunk/joafip-pmap/src/test/java/net/sf/joafip/pmap/TestFileTreeMap.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestIndexMultipleValue.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestIndexUniqueValue.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/pmap/
trunk/joafip-testsuite/src/main/java/net/sf/joafip/pmap/FileTreeMapTests.java
Removed Paths:
-------------
trunk/joafip/doc/class_comment_header.txt
trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/IDataRecordKeyComparator.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestIndex.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2012-03-03 02:24:53
|
Revision: 2992
http://joafip.svn.sourceforge.net/joafip/?rev=2992&view=rev
Author: luc_peuvrier
Date: 2012-03-03 02:24:47 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
joafip-pmap project added
Modified Paths:
--------------
trunk/joafip-parent/pom.xml
Property Changed:
----------------
trunk/joafip-pmap/
Modified: trunk/joafip-parent/pom.xml
===================================================================
--- trunk/joafip-parent/pom.xml 2012-03-03 02:23:44 UTC (rev 2991)
+++ trunk/joafip-parent/pom.xml 2012-03-03 02:24:47 UTC (rev 2992)
@@ -349,6 +349,7 @@
<module>../joafip-rbtree</module>
<module>../joafip-collection</module>
<module>../joafip-heapfile</module>
+ <module>../joafip-pmap</module>
<module>../joafip-callback</module>
<module>../joafip-java-agent</module>
<module>../joafip-meminspector</module>
Property changes on: trunk/joafip-pmap
___________________________________________________________________
Added: svn:ignore
+ .settings
.classpath
.project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
