[Joafip-svn] SF.net SVN: joafip:[3091] trunk

[<luc...@us...>]

Revision: 3091
          http://joafip.svn.sourceforge.net/joafip/?rev=3091&view=rev
Author:   luc_peuvrier
Date:     2012-05-24 03:41:41 +0000 (Thu, 24 May 2012)
Log Message:
-----------
todo update. tests. clean up.

Modified Paths:
--------------
    trunk/joafip/doc/_todo.txt
    trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
    trunk/joafip-jpa/pom.xml
    trunk/joafip-jpa/src/main/java/net/sf/joafip/jpa/JoaFipEntityManager.java
    trunk/joafip-jpa/src/main/java/net/sf/joafip/jpa/JoaFipEntityTransaction.java

Added Paths:
-----------
    trunk/joafip-jpa/src/main/resources/log4j.properties

Modified: trunk/joafip/doc/_todo.txt
===================================================================
--- trunk/joafip/doc/_todo.txt	2012-05-23 05:25:24 UTC (rev 3090)
+++ trunk/joafip/doc/_todo.txt	2012-05-24 03:41:41 UTC (rev 3091)
@@ -36,7 +36,7 @@
 - heap file project make able to create a map in file with a comparable key
 - new joafip-pmap project, a file persisted tree map
 - heap data manager implemented in btree+ (not use by joafip since HeapFileDataManager speeder)
-- improve speed for file access using mapped byte buffer (+70%)
+- improve speed for file access using mapped byte buffer
 
 minor changes:
 - added search last in red black tree manager
@@ -53,7 +53,7 @@
 - PLinkedTreeSet and PLinkedHashSet implement List
 - setSubstitutionOfJavaUtilCollection can be enabled or disabled, enabled by default
 - removeSubstitution added in IFilePersistence
-- new java agent implementation
+- new java agent implementation (performance to be improved)
 
 bugs corrected:
 - search in red black tree manager did not return the first element of group of duplicate values

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-05-23 05:25:24 UTC (rev 3090)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java	2012-05-24 03:41:41 UTC (rev 3091)
@@ -92,7 +92,7 @@
 		try {
 			if (dataManager == null) {
 				builder.setFileAccessMode(EnumFileAccessMode.MAPPED_RANDOM_FILE_ACCESS);
-				builder.setMaxBufferSize(256 * 1024);
+				builder.setMaxBufferSize(512 * 1024);
 				builder.setMaxNumberOfBuffer(256);
 				builder.setPathName(pathName);
 				if (useCache) {

Modified: trunk/joafip-jpa/pom.xml
===================================================================
--- trunk/joafip-jpa/pom.xml	2012-05-23 05:25:24 UTC (rev 3090)
+++ trunk/joafip-jpa/pom.xml	2012-05-24 03:41:41 UTC (rev 3091)
@@ -7,7 +7,7 @@
 		<version>1.0.0</version>
 		<relativePath>../joafip-parent</relativePath>
 	</parent>
-	<groupId>net.sf.joafip</groupId>
+	<!-- <groupId>net.sf.joafip</groupId>  -->
 	<artifactId>joafip-jpa</artifactId>
 	<packaging>jar</packaging>
 	<version>4.0.0b8</version>

Modified: trunk/joafip-jpa/src/main/java/net/sf/joafip/jpa/JoaFipEntityManager.java
===================================================================
--- trunk/joafip-jpa/src/main/java/net/sf/joafip/jpa/JoaFipEntityManager.java	2012-05-23 05:25:24 UTC (rev 3090)
+++ trunk/joafip-jpa/src/main/java/net/sf/joafip/jpa/JoaFipEntityManager.java	2012-05-24 03:41:41 UTC (rev 3091)
@@ -24,6 +24,7 @@
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.metamodel.Metamodel;
 
+import net.sf.joafip.kvstore.entity.EnumFileAccessMode;
 import net.sf.joafip.service.FilePersistenceBuilder;
 import net.sf.joafip.service.FilePersistenceClassNotFoundException;
 import net.sf.joafip.service.FilePersistenceDataCorruptedException;
@@ -63,6 +64,9 @@
 			final FilePersistenceBuilder builder = new FilePersistenceBuilder();
 			// builder.setDataModelIdentifier(1);
 			builder.setPathName(storageDirectory.getPath());
+			builder.setFileAccessMode(EnumFileAccessMode.MAPPED_RANDOM_FILE_ACCESS);
+			builder.setMaxBufferSize(8*1024);
+			builder.setMaxNumberOfBuffer(32);
 			builder.setGarbageManagement(false);
 			builder.setRemoveFiles(false);
 			filePersistence = builder.build();

Modified: trunk/joafip-jpa/src/main/java/net/sf/joafip/jpa/JoaFipEntityTransaction.java
===================================================================
--- trunk/joafip-jpa/src/main/java/net/sf/joafip/jpa/JoaFipEntityTransaction.java	2012-05-23 05:25:24 UTC (rev 3090)
+++ trunk/joafip-jpa/src/main/java/net/sf/joafip/jpa/JoaFipEntityTransaction.java	2012-05-24 03:41:41 UTC (rev 3091)
@@ -86,13 +86,11 @@
 		try {
 			if (session.isOpened()) {
 				try {
-					session.close(EnumFilePersistenceCloseAction.DO_NOT_SAVE);
+					session.close(EnumFilePersistenceCloseAction.SAVE);
 				} catch (Exception exception) {// NOPMD
 					System.err.println("error while saving close " + exception);
 				}
 			}
-			filePersistence.close(); // ?? jmv
-
 		} catch (FilePersistenceException e) {
 			e.printStackTrace();
 		} finally {

Added: trunk/joafip-jpa/src/main/resources/log4j.properties
===================================================================
--- trunk/joafip-jpa/src/main/resources/log4j.properties	                        (rev 0)
+++ trunk/joafip-jpa/src/main/resources/log4j.properties	2012-05-24 03:41:41 UTC (rev 3091)
@@ -0,0 +1,24 @@
+
+
+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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.