[hibernate-commits] Hibernate SVN: r19206 - search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing.

[hibernate-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-04-09 15:34:07 -0400 (Fri, 09 Apr 2010)
New Revision: 19206

Modified:
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/EntityConsumerLuceneworkProducer.java
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/IdentifierConsumerEntityProducer.java
Log:
HSEARCH-502 update MassIndexer to use new core features

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/EntityConsumerLuceneworkProducer.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/EntityConsumerLuceneworkProducer.java	2010-04-09 19:23:01 UTC (rev 19205)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/EntityConsumerLuceneworkProducer.java	2010-04-09 19:34:07 UTC (rev 19206)
@@ -31,7 +31,7 @@
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.Hibernate;
-import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
@@ -85,6 +85,7 @@
 		Session session = sessionFactory.openSession();
 		session.setFlushMode( FlushMode.MANUAL );
 		session.setCacheMode( cacheMode );
+		session.setDefaultReadOnly( true );
 		try {
 			Transaction transaction = session.beginTransaction();
 			indexAllQueue( session );
@@ -107,7 +108,7 @@
 				else {
 					log.trace( "received an object {}", take );
 					//trick to attach the objects to session:
-					session.lock( take, LockMode.NONE );
+					session.buildLockRequest( LockOptions.NONE ).lock( take );
 					index( take, session );
 					monitor.documentsBuilt( 1 );
 					session.evict( take );

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/IdentifierConsumerEntityProducer.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/IdentifierConsumerEntityProducer.java	2010-04-09 19:23:01 UTC (rev 19205)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/IdentifierConsumerEntityProducer.java	2010-04-09 19:34:07 UTC (rev 19206)
@@ -78,6 +78,7 @@
 		Session session = sessionFactory.openSession();
 		session.setFlushMode( FlushMode.MANUAL );
 		session.setCacheMode( cacheMode );
+		session.setDefaultReadOnly( true );
 		try {
 			Transaction transaction = session.beginTransaction();
 			loadAllFromQueue( session );