Hibernate SVN: r20180 - in search/trunk/hibernate-search/src/main/java/org/hibernate/search: batchindexing and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-08-19 07:51:16 -0400 (Thu, 19 Aug 2010)
New Revision: 20180
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/MassIndexerProgressMonitor.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitor.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/WorkerBuildContext.java
Log:
HSEARCH-278 Updating javadoc, formatting and copy right information. No functional changes
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java 2010-08-19 11:50:14 UTC (rev 20179)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java 2010-08-19 11:51:16 UTC (rev 20180)
@@ -1,73 +1,79 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.backend.impl.batchlucene;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.hibernate.search.spi.WorkerBuildContext;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
+import org.hibernate.search.spi.WorkerBuildContext;
/**
- * Implementors of this interface are not drop-in replacements for the standard BackendQueueProcessorFactory
+ * Implementations of this interface are not drop-in replacements for the standard BackendQueueProcessorFactory,
* but are meant to be used only during batch processing.
* The order of LuceneWork(s) processed is not guaranteed as the queue is consumed by several
- * concurrent workers.
- *
+ * concurrent workers.
+ *
* @author Sanne Grinovero
*/
public interface BatchBackend {
-
+
/**
* Used at startup, called once as first method.
+ *
* @param props all configuration properties
- * @param searchFactory the client
+ * @param monitor the indexing progress monitor
+ * @param context the build context for the workers.
*/
void initialize(Properties props, MassIndexerProgressMonitor monitor, WorkerBuildContext context);
/**
* Enqueues one work to be processed asynchronously
+ *
* @param work
+ *
* @throws InterruptedException if the current thread is interrupted while
- * waiting for the work queue to have enough space.
+ * waiting for the work queue to have enough space.
*/
void enqueueAsyncWork(LuceneWork work) throws InterruptedException;
-
+
/**
* Does one work in sync
+ *
* @param work
+ *
* @throws InterruptedException
*/
void doWorkInSync(LuceneWork work);
-
+
/**
* Waits until all work is done and terminates the executors.
* IndexWriter is not closed yet: work in sync can still be processed.
+ *
* @throws InterruptedException if the current thread is interrupted
- * while waiting for the enqueued tasks to be finished.
+ * while waiting for the enqueued tasks to be finished.
*/
void stopAndFlush(long timeout, TimeUnit unit) throws InterruptedException;
@@ -76,5 +82,4 @@
* No other method should be used after this one.
*/
void close();
-
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java 2010-08-19 11:50:14 UTC (rev 20179)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java 2010-08-19 11:51:16 UTC (rev 20180)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.batchindexing;
@@ -29,6 +28,8 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+
import org.hibernate.CacheMode;
import org.hibernate.SessionFactory;
import org.hibernate.search.backend.OptimizeLuceneWork;
@@ -36,20 +37,19 @@
import org.hibernate.search.backend.impl.batchlucene.BatchBackend;
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.util.LoggerFactory;
-import org.slf4j.Logger;
/**
* Makes sure that several different BatchIndexingWorkspace(s)
* can be started concurrently, sharing the same batch-backend
* and IndexWriters.
- *
+ *
* @author Sanne Grinovero
*/
public class BatchCoordinator implements Runnable {
-
+
private static final Logger log = LoggerFactory.make();
-
- private final Class<?>[] rootEntities; //entity types to reindex exluding all subtypes of each-other
+
+ private final Class<?>[] rootEntities; //entity types to reindex excluding all subtypes of each-other
private final SearchFactoryImplementor searchFactoryImplementor;
private final SessionFactory sessionFactory;
private final int objectLoadingThreads;
@@ -62,30 +62,30 @@
private final CountDownLatch endAllSignal;
private final MassIndexerProgressMonitor monitor;
private final long objectsLimit;
-
+
private BatchBackend backend;
public BatchCoordinator(Set<Class<?>> rootEntities,
- SearchFactoryImplementor searchFactoryImplementor,
- SessionFactory sessionFactory, int objectLoadingThreads,
- int collectionLoadingThreads, CacheMode cacheMode,
- int objectLoadingBatchSize, long objectsLimit,
- boolean optimizeAtEnd,
- boolean purgeAtStart, boolean optimizeAfterPurge,
- MassIndexerProgressMonitor monitor) {
- this.rootEntities = rootEntities.toArray( new Class<?>[ rootEntities.size() ] );
- this.searchFactoryImplementor = searchFactoryImplementor;
- this.sessionFactory = sessionFactory;
- this.objectLoadingThreads = objectLoadingThreads;
- this.collectionLoadingThreads = collectionLoadingThreads;
- this.cacheMode = cacheMode;
- this.objectLoadingBatchSize = objectLoadingBatchSize;
- this.optimizeAtEnd = optimizeAtEnd;
- this.purgeAtStart = purgeAtStart;
- this.optimizeAfterPurge = optimizeAfterPurge;
- this.monitor = monitor;
- this.objectsLimit = objectsLimit;
- this.endAllSignal = new CountDownLatch( rootEntities.size() );
+ SearchFactoryImplementor searchFactoryImplementor,
+ SessionFactory sessionFactory, int objectLoadingThreads,
+ int collectionLoadingThreads, CacheMode cacheMode,
+ int objectLoadingBatchSize, long objectsLimit,
+ boolean optimizeAtEnd,
+ boolean purgeAtStart, boolean optimizeAfterPurge,
+ MassIndexerProgressMonitor monitor) {
+ this.rootEntities = rootEntities.toArray( new Class<?>[rootEntities.size()] );
+ this.searchFactoryImplementor = searchFactoryImplementor;
+ this.sessionFactory = sessionFactory;
+ this.objectLoadingThreads = objectLoadingThreads;
+ this.collectionLoadingThreads = collectionLoadingThreads;
+ this.cacheMode = cacheMode;
+ this.objectLoadingBatchSize = objectLoadingBatchSize;
+ this.optimizeAtEnd = optimizeAtEnd;
+ this.purgeAtStart = purgeAtStart;
+ this.optimizeAfterPurge = optimizeAfterPurge;
+ this.monitor = monitor;
+ this.objectsLimit = objectsLimit;
+ this.endAllSignal = new CountDownLatch( rootEntities.size() );
}
public void run() {
@@ -93,10 +93,11 @@
try {
beforeBatch(); // purgeAll and pre-optimize activities
doBatchWork();
- backend.stopAndFlush( 60L*60*24, TimeUnit.SECONDS ); //1 day : enough to flush to indexes?
+ backend.stopAndFlush( 60L * 60 * 24, TimeUnit.SECONDS ); //1 day : enough to flush to indexes?
// backend.stopAndFlush( 10, TimeUnit.SECONDS );
afterBatch();
- } catch (InterruptedException e) {
+ }
+ catch ( InterruptedException e ) {
log.error( "Batch indexing was interrupted" );
Thread.currentThread().interrupt();
}
@@ -108,16 +109,20 @@
/**
* Will spawn a thread for each type in rootEntities, they will all re-join
* on endAllSignal when finished.
+ *
* @throws InterruptedException if interrupted while waiting for endAllSignal.
*/
private void doBatchWork() throws InterruptedException {
ExecutorService executor = Executors.newFixedThreadPool( rootEntities.length, "BatchIndexingWorkspace" );
for ( Class<?> type : rootEntities ) {
- executor.execute( new BatchIndexingWorkspace(
- searchFactoryImplementor, sessionFactory, type,
- objectLoadingThreads, collectionLoadingThreads,
- cacheMode, objectLoadingBatchSize,
- endAllSignal, monitor, backend, objectsLimit ) );
+ executor.execute(
+ new BatchIndexingWorkspace(
+ searchFactoryImplementor, sessionFactory, type,
+ objectLoadingThreads, collectionLoadingThreads,
+ cacheMode, objectLoadingBatchSize,
+ endAllSignal, monitor, backend, objectsLimit
+ )
+ );
}
executor.shutdown();
endAllSignal.await(); //waits for the executor to finish
@@ -142,7 +147,7 @@
Set<Class<?>> targetedClasses = searchFactoryImplementor.getIndexedTypesPolymorphic( rootEntities );
for ( Class<?> clazz : targetedClasses ) {
//needs do be in-sync work to make sure we wait for the end of it.
- backend.doWorkInSync( new PurgeAllLuceneWork( clazz ) );
+ backend.doWorkInSync( new PurgeAllLuceneWork( clazz ) );
}
if ( this.optimizeAfterPurge ) {
optimize( targetedClasses );
@@ -156,5 +161,4 @@
backend.doWorkInSync( new OptimizeLuceneWork( clazz ) );
}
}
-
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/MassIndexerProgressMonitor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/MassIndexerProgressMonitor.java 2010-08-19 11:50:14 UTC (rev 20179)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/batchindexing/MassIndexerProgressMonitor.java 2010-08-19 11:51:16 UTC (rev 20180)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.batchindexing;
@@ -29,12 +28,15 @@
* a MassIndexerProgressMonitor can be defined in the configuration
* property hibernate.search.worker.indexing.monitor
* implementing this interface to track indexing performance.
- *
- * Implementors must:
- * be threadsafe
- * have a no-arg constructor.
- *
+ * <p/>
+ * Implementations must:
+ * <ul>
+ * <li> be threadsafe </li>
+ * <li> have a no-arg constructor </li>
+ * </ul>
+ *
* @author Sanne Grinovero
+ * @author Hardy Ferentschik
*/
public interface MassIndexerProgressMonitor {
@@ -42,7 +44,8 @@
* The number of documents sent to the backend;
* This is called several times during
* the indexing process.
- * @param increment
+ *
+ * @param increment number of documents sent to backend
*/
void documentsAdded(long increment);
@@ -50,7 +53,8 @@
* The number of Documents built;
* This is called several times and concurrently during
* the indexing process.
- * @param number
+ *
+ * @param number number of {@code Document}s built
*/
void documentsBuilt(int number);
@@ -58,7 +62,8 @@
* The number of entities loaded from database;
* This is called several times and concurrently during
* the indexing process.
- * @param size
+ *
+ * @param size number of entities loaded from database
*/
void entitiesLoaded(int size);
@@ -68,8 +73,9 @@
* the implementation should add them up.
* This is called several times and concurrently during
* the indexing process.
- * @param count
+ *
+ * @param count number of newly indexed entities which has to
+ * ber added to total count
*/
void addToTotalCount(long count);
-
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitor.java 2010-08-19 11:50:14 UTC (rev 20179)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitor.java 2010-08-19 11:51:16 UTC (rev 20180)
@@ -28,6 +28,8 @@
import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
/**
+ * A JMX based mass indexer progress monitor. This monitor will allow you to follow mass indexing progress via JMX.
+ *
* @author Hardy Ferentschik
*/
public class IndexingProgressMonitor implements IndexingProgressMonitorMBean, MassIndexerProgressMonitor {
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/WorkerBuildContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/WorkerBuildContext.java 2010-08-19 11:50:14 UTC (rev 20179)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/WorkerBuildContext.java 2010-08-19 11:51:16 UTC (rev 20180)
@@ -1,7 +1,29 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.search.spi;
import java.util.Set;
-import java.util.concurrent.locks.ReentrantLock;
import org.apache.lucene.search.Similarity;
@@ -20,11 +42,18 @@
*/
public interface WorkerBuildContext extends BuildContext {
void setBackendQueueProcessorFactory(BackendQueueProcessorFactory backendQueueProcessorFactory);
- public OptimizerStrategy getOptimizerStrategy(DirectoryProvider<?> provider);
+
+ OptimizerStrategy getOptimizerStrategy(DirectoryProvider<?> provider);
+
Set<Class<?>> getClassesInDirectoryProvider(DirectoryProvider<?> provider);
+
LuceneIndexingParameters getIndexingParameters(DirectoryProvider<?> directoryProvider);
+
Similarity getSimilarity(DirectoryProvider<?> directoryProvider);
+
boolean isExclusiveIndexUsageEnabled(DirectoryProvider<?> directoryProvider);
+
ErrorHandler getErrorHandler();
+
<T> DocumentBuilderIndexedEntity<T> getDocumentBuilderIndexedEntity(Class<T> managedType);
}
15 years, 4 months
- 1
- 0
Hibernate SVN: r20179 - in search/trunk/hibernate-search/src: test/java/org/hibernate/search/test/batchindexing and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-08-19 07:50:14 -0400 (Thu, 19 Aug 2010)
New Revision: 20179
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java
Log:
HSEARCH-278
* Removed obsolete constant
* Reverted IndexingGeneratedCorpusTest into its original state
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java 2010-08-19 11:49:16 UTC (rev 20178)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java 2010-08-19 11:50:14 UTC (rev 20179)
@@ -34,8 +34,6 @@
* @author Hardy Ferentschik
*/
public interface Statistics {
- public static final String STATISTICS_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=StatisticsMBean";
-
/**
* Reset all statistics.
*/
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java 2010-08-19 11:49:16 UTC (rev 20178)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java 2010-08-19 11:50:14 UTC (rev 20179)
@@ -48,7 +48,7 @@
private final int BOOK_NUM = 140;
private final int ANCIENTBOOK_NUM = 120;
- private final int DVD_NUM = 10000;
+ private final int DVD_NUM = 200;
private SentenceInventor sentenceInventor = new SentenceInventor( 7L, 4000 );
private FullTextSessionBuilder builder;
@@ -136,9 +136,6 @@
purgeAll(); // empty indexes
verifyIsEmpty();
reindexAll(); // rebuild the indexes
-
- Thread.sleep( 60000 );
-
verifyResultNumbers(); // verify the count match again
reindexAll(); //tests that purgeAll is automatic:
verifyResultNumbers(); //..same numbers again
15 years, 4 months
- 1
- 0
Hibernate SVN: r20178 - in search/trunk: hibernate-search/src/main/java/org/hibernate/search/engine and 9 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-08-19 07:49:16 -0400 (Thu, 19 Aug 2010)
New Revision: 20178
Added:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/AbstractLoader.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsInfo.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsInfoMBean.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImplementor.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/Author.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/Book.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/IAuthor.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/IBook.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/ProxyTest.java
Removed:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfo.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfoMBean.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/JMXRegistrar.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java
Modified:
search/trunk/hibernate-search-integrationtest/pom.xml
search/trunk/hibernate-search/src/main/java/org/hibernate/search/SearchFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/Loader.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/MultiClassesQueryLoader.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/ObjectLoader.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/QueryLoader.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/exception/ErrorHandler.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/NoMBeansEnabledTest.java
Log:
HSEARCH-278
* Added a Statistcs and StatisticsImplementor interfaces equivalent to Core
* Moved the ConfigInfo interface into Statistics
* Introduced AbstractLoader in order to track object loading time
* Added JMX bean registration into SearchFactoryImplementor
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/SearchFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/SearchFactory.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/SearchFactory.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search;
@@ -35,20 +34,22 @@
* Provide application wide operations as well as access to the underlying Lucene resources.
*
* @author Emmanuel Bernard
+ * @author Hardy Ferentschik
*/
public interface SearchFactory {
/**
- * Provide the configured readerProvider strategy,
- * hence access to a Lucene IndexReader
+ * @return Return the configured reader provider.
*/
ReaderProvider getReaderProvider();
/**
- * Provide access to the DirectoryProviders (hence the Lucene Directories)
- * for a given entity
+ * Provide access to the DirectoryProviders for a given entity.
* In most cases, the returned type will be a one element array.
* But if the given entity is configured to use sharded indexes, then multiple
* elements will be returned. In this case all of them should be considered.
+ *
+ * @param entity the entity for which to return the directory providers
+ * @return array of {@code DirectoryProvider}s for the specified entity
*/
DirectoryProvider[] getDirectoryProviders(Class<?> entity);
@@ -59,13 +60,16 @@
/**
* Optimize the index holding <code>entityType</code>
+ *
+ * @param entityType the entity type (index) to optimize
*/
void optimize(Class entityType);
/**
- * Experimental API
- * retrieve an analyzer instance by its definition name
+ * Retrieve an analyzer instance by its definition name
*
+ * @param name the name of the analyzer
+ * @return analyzer with the specified name
* @throws SearchException if the definition name is unknown
*/
Analyzer getAnalyzer(String name);
@@ -83,12 +87,12 @@
Analyzer getAnalyzer(Class<?> clazz);
/**
- * Return a query builder providing a fluent API to create Lucene queries
+ * @return return a query builder providing a fluent API to create Lucene queries
*/
QueryContextBuilder buildQueryBuilder();
/**
- * Retrieve the statistics for this factory.
+ * Retrieve the statistics instance for this factory.
*
* @return The statistics.
*/
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/AbstractLoader.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/AbstractLoader.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/AbstractLoader.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,75 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.engine;
+
+import java.util.List;
+
+import org.hibernate.Session;
+import org.hibernate.search.stat.StatisticsImplementor;
+
+
+/**
+ * Abstract loader which will take care of taking object loading timings.
+ *
+ * @author Hardy Ferentschik
+ */
+public abstract class AbstractLoader implements Loader {
+ private StatisticsImplementor statisticsImplementor;
+ private boolean takeTimings;
+
+ public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
+ statisticsImplementor = searchFactoryImplementor.getStatisticsImplementor();
+ takeTimings = searchFactoryImplementor.getStatistics().isStatisticsEnabled();
+ }
+
+ public final Object load(EntityInfo entityInfo) {
+ long startTime = 0;
+ if ( takeTimings ) {
+ startTime = System.currentTimeMillis();
+ }
+ Object loadedObject = executeLoad( entityInfo );
+ if ( takeTimings ) {
+ statisticsImplementor.objectLoadExecuted( 1, System.currentTimeMillis() - startTime );
+ }
+ return loadedObject;
+ }
+
+ public abstract Object executeLoad(EntityInfo entityInfo);
+
+ public List load(EntityInfo... entityInfos) {
+ long startTime = 0;
+ if ( takeTimings ) {
+ startTime = System.currentTimeMillis();
+ }
+ List loadedObjects = executeLoad( entityInfos );
+ if ( takeTimings ) {
+ statisticsImplementor.objectLoadExecuted( loadedObjects.size(), System.currentTimeMillis() - startTime );
+ }
+ return loadedObjects;
+ }
+
+ public abstract List executeLoad(EntityInfo... entityInfo);
+}
+
+
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/Loader.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/Loader.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/Loader.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.engine;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/MultiClassesQueryLoader.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/MultiClassesQueryLoader.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/MultiClassesQueryLoader.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.engine;
@@ -36,20 +35,19 @@
import org.hibernate.annotations.common.AssertionFailure;
/**
+ * A loader which loads objects of multiple types.
+ *
* @author Emmanuel Bernard
*/
-public class MultiClassesQueryLoader implements Loader {
+public class MultiClassesQueryLoader extends AbstractLoader {
private Session session;
private SearchFactoryImplementor searchFactoryImplementor;
private List<RootEntityMetadata> entityMatadata;
- //useful if loading with a query is unsafe
- private ObjectLoader objectLoader;
public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
+ super.init( session, searchFactoryImplementor );
this.session = session;
this.searchFactoryImplementor = searchFactoryImplementor;
- this.objectLoader = new ObjectLoader();
- this.objectLoader.init( session, searchFactoryImplementor );
}
public void setEntityTypes(Set<Class<?>> entityTypes) {
@@ -74,11 +72,11 @@
}
}
- public Object load(EntityInfo entityInfo) {
+ public Object executeLoad(EntityInfo entityInfo) {
return ObjectLoaderHelper.load( entityInfo, session );
}
- public List load(EntityInfo... entityInfos) {
+ public List executeLoad(EntityInfo... entityInfos) {
if ( entityInfos.length == 0 ) return Collections.EMPTY_LIST;
if ( entityInfos.length == 1 ) {
final Object entity = load( entityInfos[0] );
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/ObjectLoader.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/ObjectLoader.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/ObjectLoader.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.engine;
@@ -37,20 +36,23 @@
/**
* @author Emmanuel Bernard
*/
-public class ObjectLoader implements Loader {
+public class ObjectLoader extends AbstractLoader {
private static final Logger log = LoggerFactory.make();
private Session session;
public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
+ super.init( session, searchFactoryImplementor );
this.session = session;
}
- public Object load(EntityInfo entityInfo) {
+ public final Object executeLoad(EntityInfo entityInfo) {
return ObjectLoaderHelper.load( entityInfo, session );
}
- public List load(EntityInfo... entityInfos) {
- if ( entityInfos.length == 0 ) return Collections.EMPTY_LIST;
+ public final List executeLoad(EntityInfo... entityInfos) {
+ if ( entityInfos.length == 0 ) {
+ return Collections.EMPTY_LIST;
+ }
if ( entityInfos.length == 1 ) {
final Object entity = load( entityInfos[0] );
if ( entity == null ) {
@@ -64,20 +66,22 @@
}
//use load to benefit from the batch-size
//we don't face proxy casting issues since the exact class is extracted from the index
- for (EntityInfo entityInfo : entityInfos) {
+ for ( EntityInfo entityInfo : entityInfos ) {
session.load( entityInfo.clazz, entityInfo.id );
}
List result = new ArrayList( entityInfos.length );
- for (EntityInfo entityInfo : entityInfos) {
+ for ( EntityInfo entityInfo : entityInfos ) {
try {
Object entity = session.load( entityInfo.clazz, entityInfo.id );
HibernateHelper.initialize( entity );
result.add( entity );
}
- catch (RuntimeException e) {
+ catch ( RuntimeException e ) {
if ( LoaderHelper.isObjectNotFoundException( e ) ) {
- log.debug( "Object found in Search index but not in database: {} with id {}",
- entityInfo.clazz, entityInfo.id );
+ log.debug(
+ "Object found in Search index but not in database: {} with id {}",
+ entityInfo.clazz, entityInfo.id
+ );
}
else {
throw e;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/QueryLoader.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/QueryLoader.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/QueryLoader.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,31 +1,30 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.engine;
+import java.util.Collections;
import java.util.List;
-import java.util.Collections;
import org.hibernate.Criteria;
import org.hibernate.Session;
@@ -33,8 +32,9 @@
/**
* @author Emmanuel Bernard
+ * @author Hardy Ferentschik
*/
-public class QueryLoader implements Loader {
+public class QueryLoader extends AbstractLoader {
private Session session;
private Class entityType;
@@ -43,6 +43,7 @@
private boolean isExplicitCriteria;
public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) {
+ super.init( session, searchFactoryImplementor );
this.session = session;
this.searchFactoryImplementor = searchFactoryImplementor;
}
@@ -51,16 +52,24 @@
this.entityType = entityType;
}
- public Object load(EntityInfo entityInfo) {
+ public final Object executeLoad(EntityInfo entityInfo) {
//if explicit criteria, make sure to use it to load the objects
- if ( isExplicitCriteria ) load( new EntityInfo[] { entityInfo } );
+ if ( isExplicitCriteria ) {
+ load( new EntityInfo[] { entityInfo } );
+ }
return ObjectLoaderHelper.load( entityInfo, session );
}
- public List load(EntityInfo... entityInfos) {
- if ( entityInfos.length == 0 ) return Collections.EMPTY_LIST;
- if ( entityType == null ) throw new AssertionFailure( "EntityType not defined" );
- if ( criteria == null ) criteria = session.createCriteria( entityType );
+ public final List executeLoad(EntityInfo... entityInfos) {
+ if ( entityInfos.length == 0 ) {
+ return Collections.EMPTY_LIST;
+ }
+ if ( entityType == null ) {
+ throw new AssertionFailure( "EntityType not defined" );
+ }
+ if ( criteria == null ) {
+ criteria = session.createCriteria( entityType );
+ }
ObjectLoaderHelper.initializeObjects( entityInfos, criteria, entityType, searchFactoryImplementor );
return ObjectLoaderHelper.returnAlreadyLoadedObjectsInCorrectOrder( entityInfos, session );
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,32 +1,32 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.engine;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;
+import javax.management.ObjectName;
import org.apache.lucene.search.Similarity;
@@ -37,11 +37,12 @@
import org.hibernate.search.exception.ErrorHandler;
import org.hibernate.search.filter.FilterCachingStrategy;
import org.hibernate.search.spi.SearchFactoryIntegrator;
+import org.hibernate.search.stat.StatisticsImplementor;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.optimization.OptimizerStrategy;
/**
- * Interface which gives access to the different directory providers and their configuration.
+ * Interface which gives access to the metadata. Intended to be used by Search components
*
* @author Emmanuel Bernard
* @author Hardy Ferentschik
@@ -82,4 +83,17 @@
boolean isExclusiveIndexUsageEnabled(DirectoryProvider<?> provider);
ErrorHandler getErrorHandler();
+
+ ObjectName registerMBean(Object bean, String name, boolean allowMultipleObjects);
+
+ void unRegisterMBean(ObjectName name);
+
+ boolean isJMXEnabled();
+
+ /**
+ * Retrieve the statistics implementor instance for this factory.
+ *
+ * @return The statistics implementor.
+ */
+ public StatisticsImplementor getStatisticsImplementor();
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/exception/ErrorHandler.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/exception/ErrorHandler.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/exception/ErrorHandler.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,26 +1,25 @@
-/* $Id: SearchFactoryImplementor.java 19002 2010-03-16 01:28:07Z hardy.ferentschik $
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.exception;
@@ -30,6 +29,6 @@
*/
public interface ErrorHandler {
- void handle( ErrorContext context );
-
+ void handle(ErrorContext context);
+
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,29 +1,29 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.impl;
+import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -32,6 +32,9 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantLock;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.search.Similarity;
@@ -56,9 +59,8 @@
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.exception.ErrorHandler;
import org.hibernate.search.filter.FilterCachingStrategy;
-import org.hibernate.search.jmx.JMXRegistrar;
-import org.hibernate.search.jmx.StatisticsImpl;
-import org.hibernate.search.jmx.StatisticsImplMBean;
+import org.hibernate.search.jmx.StatisticsInfo;
+import org.hibernate.search.jmx.StatisticsInfoMBean;
import org.hibernate.search.query.dsl.v2.QueryContextBuilder;
import org.hibernate.search.query.dsl.v2.impl.ConnectedQueryContextBuilder;
import org.hibernate.search.reader.ReaderProvider;
@@ -67,6 +69,8 @@
import org.hibernate.search.spi.internals.PolymorphicIndexHierarchy;
import org.hibernate.search.spi.internals.StateSearchFactoryImplementor;
import org.hibernate.search.stat.Statistics;
+import org.hibernate.search.stat.StatisticsImpl;
+import org.hibernate.search.stat.StatisticsImplementor;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.optimization.OptimizerStrategy;
import org.hibernate.search.util.LoggerFactory;
@@ -101,7 +105,7 @@
private final Properties configurationProperties;
private final ErrorHandler errorHandler;
private final PolymorphicIndexHierarchy indexHierarchy;
- private final Statistics statistics;
+ private final StatisticsImpl statistics;
/**
* Each directory provider (index) can have its own performance settings.
@@ -125,15 +129,14 @@
this.indexingStrategy = cfg.indexingStrategy;
this.readerProvider = cfg.readerProvider;
this.worker = cfg.worker;
- this.statistics = new StatisticsImpl();
+ this.statistics = new StatisticsImpl( this );
String enableStats = configurationProperties.getProperty( Environment.JMX_ENABLED );
if ( "true".equalsIgnoreCase( enableStats ) ) {
statistics.setStatisticsEnabled( true );
}
- String enableJMX = configurationProperties.getProperty( Environment.JMX_ENABLED );
- if ( "true".equalsIgnoreCase( enableJMX ) ) {
- JMXRegistrar.registerMBean( statistics, StatisticsImplMBean.STATISTICS_MBEAN_OBJECT_NAME );
+ if ( isJMXEnabled() ) {
+ registerMBean( new StatisticsInfo( statistics ), StatisticsInfoMBean.STATISTICS_MBEAN_OBJECT_NAME, false );
}
}
@@ -283,6 +286,10 @@
return statistics;
}
+ public StatisticsImplementor getStatisticsImplementor() {
+ return statistics;
+ }
+
public FilterCachingStrategy getFilterCachingStrategy() {
return filterCachingStrategy;
}
@@ -350,6 +357,54 @@
return errorHandler;
}
+ public ObjectName registerMBean(Object bean, String name, boolean allowMultipleObjects) {
+ if ( !isJMXEnabled() ) {
+ return null;
+ }
+
+ ObjectName objectName = createObjectName( name );
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ if ( mbs.isRegistered( objectName ) ) {
+ try {
+ mbs.unregisterMBean( objectName );
+ }
+ catch ( Exception e ) {
+ log.warn( "Unable to un-register existing MBean: " + name, e );
+ }
+ }
+
+ try {
+ mbs.registerMBean( bean, objectName );
+ }
+ catch ( Exception e ) {
+ throw new SearchException( "Unable to enable MBean for Hibernate Search", e );
+ }
+ return objectName;
+ }
+
+ public void unRegisterMBean(ObjectName name) {
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ if ( mbs.isRegistered( name ) ) {
+ try {
+ mbs.unregisterMBean( name );
+ }
+ catch ( Exception e ) {
+ log.warn( "Unable to un-register existing MBean: " + name, e );
+ }
+ }
+ }
+
+ private static ObjectName createObjectName(String name) {
+ ObjectName objectName;
+ try {
+ objectName = new ObjectName( name );
+ }
+ catch ( MalformedObjectNameException e ) {
+ throw new SearchException( "Invalid JMX Bean name: " + name, e );
+ }
+ return objectName;
+ }
+
public PolymorphicIndexHierarchy getIndexHierarchy() {
return indexHierarchy;
}
@@ -361,4 +416,9 @@
public SearchFactoryImplementor getUninitializedSearchFactory() {
return this;
}
+
+ public boolean isJMXEnabled() {
+ String enableJMX = getConfigurationProperties().getProperty( Environment.JMX_ENABLED );
+ return "true".equalsIgnoreCase( enableJMX );
+ }
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
*/
package org.hibernate.search.impl;
@@ -28,21 +27,19 @@
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import javax.management.ObjectName;
import org.slf4j.Logger;
import org.hibernate.CacheMode;
import org.hibernate.SessionFactory;
-import org.hibernate.search.Environment;
import org.hibernate.search.MassIndexer;
import org.hibernate.search.batchindexing.BatchCoordinator;
import org.hibernate.search.batchindexing.Executors;
import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.jmx.IndexingProgressMonitorMBean;
import org.hibernate.search.jmx.IndexingProgressMonitor;
-import org.hibernate.search.jmx.JMXRegistrar;
-import org.hibernate.search.spi.internals.StateSearchFactoryImplementor;
+import org.hibernate.search.jmx.IndexingProgressMonitorMBean;
import org.hibernate.search.util.LoggerFactory;
/**
@@ -78,17 +75,12 @@
this.searchFactoryImplementor = searchFactory;
this.sessionFactory = sessionFactory;
rootEntities = toRootEntities( searchFactoryImplementor, entities );
-
- if ( searchFactory instanceof StateSearchFactoryImplementor ) {
- StateSearchFactoryImplementor stateSearchFactoryImplementor = ( StateSearchFactoryImplementor ) searchFactory;
- String enableJMX = stateSearchFactoryImplementor.getConfigurationProperties()
- .getProperty( Environment.JMX_ENABLED );
- if ( "true".equalsIgnoreCase( enableJMX ) ) {
- monitor = new IndexingProgressMonitor();
- JMXRegistrar.registerMBean(
- monitor, IndexingProgressMonitorMBean.INDEXING_PROGRESS_MONITOR_MBEAN_OBJECT_NAME
- );
- }
+ if ( searchFactoryImplementor.isJMXEnabled() ) {
+ ObjectName name = searchFactoryImplementor.registerMBean(
+ new IndexingProgressMonitor(),
+ IndexingProgressMonitorMBean.INDEXING_PROGRESS_MONITOR_MBEAN_OBJECT_NAME,
+ true
+ );
}
}
@@ -227,5 +219,4 @@
this.objectsLimit = maximum;
return this;
}
-
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.search.impl;
import java.util.Map;
@@ -5,11 +28,11 @@
import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import javax.management.ObjectName;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.search.Similarity;
-import org.hibernate.search.spi.SearchFactoryIntegrator;
import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.LuceneIndexingParameters;
import org.hibernate.search.backend.Worker;
@@ -22,10 +45,12 @@
import org.hibernate.search.filter.FilterCachingStrategy;
import org.hibernate.search.query.dsl.v2.QueryContextBuilder;
import org.hibernate.search.reader.ReaderProvider;
+import org.hibernate.search.spi.SearchFactoryIntegrator;
import org.hibernate.search.spi.internals.DirectoryProviderData;
import org.hibernate.search.spi.internals.PolymorphicIndexHierarchy;
import org.hibernate.search.spi.internals.StateSearchFactoryImplementor;
import org.hibernate.search.stat.Statistics;
+import org.hibernate.search.stat.StatisticsImplementor;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.optimization.OptimizerStrategy;
@@ -43,7 +68,7 @@
private volatile StateSearchFactoryImplementor delegate;
//lock to be acquired every time the underlying searchFactory is rebuilt
- private final Lock mutating = new ReentrantLock( );
+ private final Lock mutating = new ReentrantLock();
void setDelegate(StateSearchFactoryImplementor delegate) {
this.delegate = delegate;
@@ -145,6 +170,22 @@
return delegate.getErrorHandler();
}
+ public ObjectName registerMBean(Object bean, String name, boolean allowMultipleObjects) {
+ return delegate.registerMBean( bean, name, allowMultipleObjects );
+ }
+
+ public void unRegisterMBean(ObjectName name) {
+ delegate.unRegisterMBean( name );
+ }
+
+ public boolean isJMXEnabled() {
+ return delegate.isJMXEnabled();
+ }
+
+ public StatisticsImplementor getStatisticsImplementor() {
+ return delegate.getStatisticsImplementor();
+ }
+
public PolymorphicIndexHierarchy getIndexHierarchy() {
return delegate.getIndexHierarchy();
}
@@ -196,7 +237,7 @@
public void addClasses(Class<?>... classes) {
//todo optimize the list of
final SearchFactoryBuilder builder = new SearchFactoryBuilder().rootFactory( this );
- for (Class<?> type : classes) {
+ for ( Class<?> type : classes ) {
builder.addClass( type );
}
try {
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -74,10 +74,7 @@
import org.hibernate.search.filter.FilterCachingStrategy;
import org.hibernate.search.filter.MRUFilterCachingStrategy;
import org.hibernate.search.filter.ShardSensitiveOnlyFilter;
-import org.hibernate.search.jmx.ConfigInfo;
-import org.hibernate.search.jmx.ConfigInfoMBean;
import org.hibernate.search.jmx.IndexCtrl;
-import org.hibernate.search.jmx.JMXRegistrar;
import org.hibernate.search.reader.ReaderProvider;
import org.hibernate.search.reader.ReaderProviderFactory;
import org.hibernate.search.spi.WorkerBuildContext;
@@ -104,7 +101,7 @@
static {
Version.touch();
}
-
+
private static final Logger log = LoggerFactory.make();
private SearchConfiguration cfg;
private MutableSearchFactory rootFactory;
@@ -158,19 +155,20 @@
String enableJMX = configurationProperties.getProperty( Environment.JMX_ENABLED );
if ( "true".equalsIgnoreCase( enableJMX ) ) {
- enableJMXStatistics( searchFactoryImplementor );
+ enableIndexCrtlBean( searchFactoryImplementor );
}
return searchFactoryImplementor;
}
- private void enableJMXStatistics(SearchFactoryImplementor searchFactoryImplementor) {
- ConfigInfo configInfoBean = new ConfigInfo( searchFactoryImplementor );
- JMXRegistrar.registerMBean( configInfoBean, ConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
+ private void enableIndexCrtlBean(SearchFactoryImplementor searchFactoryImplementor) {
+ if ( !searchFactoryImplementor.isJMXEnabled() ) {
+ return;
+ }
// if we have a JNDI bound SessionFactory we can also enable the index control bean
if ( StringHelper.isNotEmpty( configurationProperties.getProperty( "hibernate.session_factory_name" ) ) ) {
IndexCtrl indexCtrlBean = new IndexCtrl( configurationProperties );
- JMXRegistrar.registerMBean( indexCtrlBean, IndexCtrl.INDEX_CTRL_MBEAN_OBJECT_NAME );
+ searchFactoryImplementor.registerMBean( indexCtrlBean, IndexCtrl.INDEX_CTRL_MBEAN_OBJECT_NAME, false );
}
}
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfo.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfo.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfo.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,136 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.jmx;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TopDocs;
-
-import org.hibernate.search.ProjectionConstants;
-import org.hibernate.search.Version;
-import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.reader.ReaderProvider;
-import org.hibernate.search.store.DirectoryProvider;
-import org.hibernate.util.ReflectHelper;
-
-/**
- * Implementation of the {@code ConfigInfoMBean} JMX attributes and operations.
- *
- * @author Hardy Ferentschik
- */
-public class ConfigInfo implements ConfigInfoMBean {
-
- private final SearchFactoryImplementor searchFactoryImplementor;
-
- public ConfigInfo(SearchFactoryImplementor searchFactoryImplementor) {
- this.searchFactoryImplementor = searchFactoryImplementor;
- }
-
- public String getSearchVersion() {
- return Version.getVersionString();
- }
-
- public Set<String> getIndexedClassNames() {
- Set<String> indexedClasses = new HashSet<String>();
- for ( Class clazz : searchFactoryImplementor.getDocumentBuildersIndexedEntities().keySet() ) {
- indexedClasses.add( clazz.getName() );
- }
- return indexedClasses;
- }
-
- public String getIndexingStrategy() {
- return searchFactoryImplementor.getIndexingStrategy();
- }
-
- public int getNumberOfIndexedEntities(String entity) {
- Class<?> clazz = getEntityClass( entity );
- DirectoryProvider[] directoryProviders = searchFactoryImplementor.getDirectoryProviders( clazz );
- ReaderProvider readerProvider = searchFactoryImplementor.getReaderProvider();
-
- int count = 0;
- for ( DirectoryProvider directoryProvider : directoryProviders ) {
- IndexReader reader = readerProvider.openReader( directoryProvider );
- IndexSearcher searcher = new IndexSearcher( reader );
- BooleanQuery boolQuery = new BooleanQuery();
- boolQuery.add( new MatchAllDocsQuery(), BooleanClause.Occur.MUST );
- boolQuery.add(
- new TermQuery( new Term( ProjectionConstants.OBJECT_CLASS, entity ) ), BooleanClause.Occur.MUST
- );
- try {
- TopDocs topdocs = searcher.search( boolQuery, 1 );
- count += topdocs.totalHits;
- }
- catch ( IOException e ) {
- throw new RuntimeException( "Unable to execute count query for entity " + entity, e );
- }
- finally {
- readerProvider.closeReader( reader );
- }
- }
- return count;
- }
-
- public Map<String, Integer> indexedEntitiesCount() {
- Map<String, Integer> countPerEntity = new HashMap<String, Integer>();
- for ( String className : getIndexedClassNames() ) {
- countPerEntity.put( className, getNumberOfIndexedEntities( className ) );
- }
- return countPerEntity;
- }
-
- public List<String> getIndexingParameters(String entity) {
- Class<?> clazz = getEntityClass( entity );
- List<String> indexingParameters = new ArrayList<String>();
- for ( DirectoryProvider directoryProvider : searchFactoryImplementor.getDirectoryProviders( clazz ) ) {
- indexingParameters.add( searchFactoryImplementor.getIndexingParameters( directoryProvider ).toString() );
- }
- return indexingParameters;
- }
-
- private Class<?> getEntityClass(String entity) {
- Class<?> clazz;
- try {
- clazz = ReflectHelper.classForName( entity, ConfigInfo.class );
- }
- catch ( ClassNotFoundException e ) {
- throw new IllegalArgumentException( entity + "not a indexed entity" );
- }
- return clazz;
- }
-}
-
-
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfoMBean.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfoMBean.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfoMBean.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,90 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.jmx;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Defines the Hibernate Search exposed JMX attributes and operations for index configuration.
- *
- * @author Hardy Ferentschik
- */
-public interface ConfigInfoMBean {
-
- public static final String CONFIG_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=ConfigInfoMBean";
-
- /**
- * Returns the Hibernate Search version.
- *
- * @return the Hibernate Search version
- */
- String getSearchVersion();
-
- /**
- * Returns a list of all indexed classes.
- *
- * @return list of all indexed classes
- */
- Set<String> getIndexedClassNames();
-
- /**
- * Returns the indexing strategy - <i>manual</i> vs. event <i>event</i>.
- *
- * @return the indexing strategy
- */
- String getIndexingStrategy();
-
- /**
- * Returns the number of documents for the given entity.
- *
- * @param entity the fqc of the entity
- *
- * @return number of documents for the specified entity name
- *
- * @throws IllegalArgumentException in case the entity name is not valid
- */
- int getNumberOfIndexedEntities(String entity);
-
- /**
- * A list of string representations of the indexing parameters for each directory of the specified entity.
- * Defaults are not displayed, but only parameters which are explicitly set via the configuration.
- *
- * @param entity the fqc of the entity
- *
- * @return A list of string representations of the indexing parameters for each directory of the specified entity
- *
- * @throws IllegalArgumentException in case the entity name is not valid
- */
- List<String> getIndexingParameters(String entity);
-
- /**
- * Returns a map of all indexed entities and their document count in the index.
- *
- * @return a map of all indexed entities and their document count. The map key is the fqc of the entity and
- * the map value is the document count.
- */
- Map<String, Integer> indexedEntitiesCount();
-}
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/JMXRegistrar.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/JMXRegistrar.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/JMXRegistrar.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,85 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.jmx;
-
-import java.lang.management.ManagementFactory;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.slf4j.Logger;
-
-import org.hibernate.search.SearchException;
-import org.hibernate.search.util.LoggerFactory;
-
-/**
- * Helper class to register JMX beans.
- *
- * @author Hardy Ferentschik
- */
-public final class JMXRegistrar {
- private static final Logger log = LoggerFactory.make();
-
- private JMXRegistrar() {
- }
-
- /**
- * Registers the specified object with the given name to the MBean server.
- *
- * @param object the object to register
- * @param name the object name to register the bean under
- */
- public static void registerMBean(Object object, String name) {
- ObjectName objectName = createObjectName( name );
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- if ( mbs.isRegistered( objectName ) ) {
- try {
- mbs.unregisterMBean( objectName );
- }
- catch ( Exception e ) {
- log.warn( "Unable to un-register existing MBean: " + name, e );
- }
- }
-
- try {
- mbs.registerMBean( object, objectName );
- }
- catch ( Exception e ) {
- throw new SearchException( "Unable to enable MBean for Hibernate Search", e );
- }
- }
-
- private static ObjectName createObjectName(String name) {
- ObjectName objectName;
- try {
- objectName = new ObjectName( name );
- }
- catch ( MalformedObjectNameException e ) {
- throw new SearchException( "Invalid JMX Bean name: " + name, e );
- }
- return objectName;
- }
-}
-
-
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,116 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.jmx;
-
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-/**
- * @author Hardy Ferentschik
- */
-public class StatisticsImpl implements StatisticsImplMBean {
- private AtomicLong searchQueryCount = new AtomicLong();
- private AtomicLong searchExecutionTotalTime = new AtomicLong();
- private AtomicLong searchExecutionMaxTime = new AtomicLong();
- private volatile String queryExecutionMaxTimeQueryString;
- private volatile boolean isStatisticsEnabled;
-
- private final Lock readLock;
- private final Lock writeLock;
-
- {
- ReadWriteLock lock = new ReentrantReadWriteLock();
- readLock = lock.readLock();
- writeLock = lock.writeLock();
- }
-
- public void clear() {
- searchQueryCount.set( 0 );
- searchExecutionTotalTime.set( 0 );
- searchExecutionMaxTime.set( 0 );
- queryExecutionMaxTimeQueryString = "";
- }
-
- public long getSearchQueryExecutionCount() {
- return searchQueryCount.get();
- }
-
- public long getSearchQueryTotalTime() {
- return searchExecutionTotalTime.get();
- }
-
- public long getSearchQueryExecutionMaxTime() {
- return searchExecutionMaxTime.get();
- }
-
- public long getSearchQueryExecutionAvgTime() {
- writeLock.lock();
- try {
- long avgExecutionTime = 0;
- if ( searchQueryCount.get() > 0 ) {
- avgExecutionTime = searchExecutionTotalTime.get() / searchQueryCount.get();
- }
- return avgExecutionTime;
- }
- finally {
- writeLock.unlock();
- }
- }
-
- public String getSearchQueryExecutionMaxTimeQueryString() {
- return queryExecutionMaxTimeQueryString;
- }
-
- public void searchExecuted(String searchString, long time) {
- readLock.lock();
- try {
- boolean isLongestQuery = false;
- for ( long old = searchExecutionMaxTime.get();
- ( time > old ) && ( isLongestQuery = searchExecutionMaxTime.compareAndSet( old, time ) );
- old = searchExecutionMaxTime.get() ) {
- ;
- }
- if ( isLongestQuery ) {
- queryExecutionMaxTimeQueryString = searchString;
- }
- searchQueryCount.getAndIncrement();
- searchExecutionTotalTime.addAndGet( time );
- }
- finally {
- readLock.unlock();
- }
- }
-
- public boolean isStatisticsEnabled() {
- return isStatisticsEnabled;
- }
-
- public void setStatisticsEnabled(boolean b) {
- isStatisticsEnabled = b;
- }
-}
-
-
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,37 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-
-// $Id:$
-package org.hibernate.search.jmx;
-
-import org.hibernate.search.stat.Statistics;
-
-/**
- * @author Hardy Ferentschik
- */
-public interface StatisticsImplMBean extends Statistics {
- public static final String STATISTICS_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=StatisticsMBean";
-}
-
-
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsInfo.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsInfo.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsInfo.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,113 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+// $Id:$
+package org.hibernate.search.jmx;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.hibernate.search.stat.Statistics;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class StatisticsInfo implements StatisticsInfoMBean {
+ private final Statistics delegate;
+
+ public StatisticsInfo(Statistics delegate) {
+ this.delegate = delegate;
+ }
+
+ public void clear() {
+ delegate.clear();
+ }
+
+ public long getSearchQueryExecutionCount() {
+ return delegate.getSearchQueryExecutionCount();
+ }
+
+ public long getSearchQueryTotalTime() {
+ return delegate.getSearchQueryTotalTime();
+ }
+
+ public long getSearchQueryExecutionMaxTime() {
+ return delegate.getSearchQueryExecutionMaxTime();
+ }
+
+ public long getSearchQueryExecutionAvgTime() {
+ return delegate.getSearchQueryExecutionAvgTime();
+ }
+
+ public String getSearchQueryExecutionMaxTimeQueryString() {
+ return delegate.getSearchQueryExecutionMaxTimeQueryString();
+ }
+
+ public long getObjectLoadingTotalTime() {
+ return delegate.getObjectLoadingTotalTime();
+ }
+
+ public long getObjectLoadingExecutionMaxTime() {
+ return delegate.getObjectLoadingExecutionMaxTime();
+ }
+
+ public long getObjectLoadingExecutionAvgTime() {
+ return delegate.getObjectLoadingExecutionAvgTime();
+ }
+
+ public long getObjectsLoadedCount() {
+ return delegate.getObjectsLoadedCount();
+ }
+
+ public boolean isStatisticsEnabled() {
+ return delegate.isStatisticsEnabled();
+ }
+
+ public void setStatisticsEnabled(boolean b) {
+ delegate.setStatisticsEnabled( b );
+ }
+
+ public String getSearchVersion() {
+ return delegate.getSearchVersion();
+ }
+
+ public Set<String> getIndexedClassNames() {
+ return delegate.getIndexedClassNames();
+ }
+
+ public int getNumberOfIndexedEntities(String entity) {
+ return delegate.getNumberOfIndexedEntities( entity );
+ }
+
+ public List<String> getIndexingParameters(String entity) {
+ return delegate.getIndexingParameters( entity );
+ }
+
+ public Map<String, Integer> indexedEntitiesCount() {
+ return delegate.indexedEntitiesCount();
+ }
+}
+
+
Copied: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsInfoMBean.java (from rev 20177, search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java)
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsInfoMBean.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsInfoMBean.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,37 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+// $Id:$
+package org.hibernate.search.jmx;
+
+import org.hibernate.search.stat.Statistics;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface StatisticsInfoMBean extends Statistics {
+ public static final String STATISTICS_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=StatisticsInfoMBean";
+}
+
+
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -414,7 +414,7 @@
resultSize = queryHits.totalHits;
if ( stats ) {
- searchFactoryImplementor.getStatistics().searchExecuted( query.toString(), System.currentTimeMillis() - startTime );
+ searchFactoryImplementor.getStatisticsImplementor().searchExecuted( query.toString(), System.currentTimeMillis() - startTime );
}
return queryHits;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -23,10 +23,19 @@
*/
package org.hibernate.search.stat;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
+ * Interface which defines several methods allowing to access statistical data. This includes average and maximum
+ * Lucene query time and object loading time.
+ *
* @author Hardy Ferentschik
*/
public interface Statistics {
+ public static final String STATISTICS_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=StatisticsMBean";
+
/**
* Reset all statistics.
*/
@@ -42,7 +51,7 @@
/**
* Get the total search time in milliseconds.
*/
- long getSearchQueryTotalTime();
+ long getSearchQueryTotalTime();
/**
* Get the time in milliseconds of the slowest search.
@@ -59,9 +68,27 @@
*/
String getSearchQueryExecutionMaxTimeQueryString();
- void searchExecuted(String searchString, long time);
+ /**
+ * Get the total object loading in milliseconds.
+ */
+ long getObjectLoadingTotalTime();
/**
+ * Get the time in milliseconds for the slowest object load.
+ */
+ long getObjectLoadingExecutionMaxTime();
+
+ /**
+ * Get the average object loading time in milliseconds.
+ */
+ long getObjectLoadingExecutionAvgTime();
+
+ /**
+ * Gets the total number of objects loaded
+ */
+ long getObjectsLoadedCount();
+
+ /**
* Are statistics logged
*/
public boolean isStatisticsEnabled();
@@ -70,6 +97,51 @@
* Enable statistics logs (this is a dynamic parameter)
*/
public void setStatisticsEnabled(boolean b);
+
+ /**
+ * Returns the Hibernate Search version.
+ *
+ * @return the Hibernate Search version
+ */
+ String getSearchVersion();
+
+ /**
+ * Returns a list of all indexed classes.
+ *
+ * @return list of all indexed classes
+ */
+ Set<String> getIndexedClassNames();
+
+ /**
+ * Returns the number of documents for the given entity.
+ *
+ * @param entity the fqc of the entity
+ *
+ * @return number of documents for the specified entity name
+ *
+ * @throws IllegalArgumentException in case the entity name is not valid
+ */
+ int getNumberOfIndexedEntities(String entity);
+
+ /**
+ * A list of string representations of the indexing parameters for each directory of the specified entity.
+ * Defaults are not displayed, but only parameters which are explicitly set via the configuration.
+ *
+ * @param entity the fqc of the entity
+ *
+ * @return A list of string representations of the indexing parameters for each directory of the specified entity
+ *
+ * @throws IllegalArgumentException in case the entity name is not valid
+ */
+ List<String> getIndexingParameters(String entity);
+
+ /**
+ * Returns a map of all indexed entities and their document count in the index.
+ *
+ * @return a map of all indexed entities and their document count. The map key is the fqc of the entity and
+ * the map value is the document count.
+ */
+ Map<String, Integer> indexedEntitiesCount();
}
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,262 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.stat;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
+
+import org.hibernate.search.ProjectionConstants;
+import org.hibernate.search.Version;
+import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.reader.ReaderProvider;
+import org.hibernate.search.store.DirectoryProvider;
+import org.hibernate.util.ReflectHelper;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class StatisticsImpl implements Statistics, StatisticsImplementor {
+ private AtomicLong searchQueryCount = new AtomicLong();
+ private AtomicLong searchExecutionTotalTime = new AtomicLong();
+ private AtomicLong searchExecutionMaxTime = new AtomicLong();
+ private volatile String queryExecutionMaxTimeQueryString;
+
+ private AtomicLong objectLoadedCount = new AtomicLong();
+ private AtomicLong objectLoadTotalTime = new AtomicLong();
+ private AtomicLong objectLoadMaxTime = new AtomicLong();
+
+ private volatile boolean isStatisticsEnabled;
+
+ private final Lock readLock;
+ private final Lock writeLock;
+
+ private final SearchFactoryImplementor searchFactoryImplementor;
+
+ public StatisticsImpl(SearchFactoryImplementor searchFactoryImplementor) {
+ ReadWriteLock lock = new ReentrantReadWriteLock();
+ readLock = lock.readLock();
+ writeLock = lock.writeLock();
+
+ this.searchFactoryImplementor = searchFactoryImplementor;
+ }
+
+ public void clear() {
+ searchQueryCount.set( 0 );
+ searchExecutionTotalTime.set( 0 );
+ searchExecutionMaxTime.set( 0 );
+ queryExecutionMaxTimeQueryString = "";
+
+ objectLoadedCount.set( 0 );
+ objectLoadMaxTime.set( 0 );
+ objectLoadTotalTime.set( 0 );
+ }
+
+ public long getSearchQueryExecutionCount() {
+ return searchQueryCount.get();
+ }
+
+ public long getSearchQueryTotalTime() {
+ return searchExecutionTotalTime.get();
+ }
+
+ public long getSearchQueryExecutionMaxTime() {
+ return searchExecutionMaxTime.get();
+ }
+
+ public long getSearchQueryExecutionAvgTime() {
+ writeLock.lock();
+ try {
+ long avgExecutionTime = 0;
+ if ( searchQueryCount.get() > 0 ) {
+ avgExecutionTime = searchExecutionTotalTime.get() / searchQueryCount.get();
+ }
+ return avgExecutionTime;
+ }
+ finally {
+ writeLock.unlock();
+ }
+ }
+
+ public String getSearchQueryExecutionMaxTimeQueryString() {
+ return queryExecutionMaxTimeQueryString;
+ }
+
+ public void searchExecuted(String searchString, long time) {
+ readLock.lock();
+ try {
+ boolean isLongestQuery = false;
+ for ( long old = searchExecutionMaxTime.get();
+ ( time > old ) && ( isLongestQuery = searchExecutionMaxTime.compareAndSet( old, time ) );
+ old = searchExecutionMaxTime.get() ) {
+ ;
+ }
+ if ( isLongestQuery ) {
+ queryExecutionMaxTimeQueryString = searchString;
+ }
+ searchQueryCount.getAndIncrement();
+ searchExecutionTotalTime.addAndGet( time );
+ }
+ finally {
+ readLock.unlock();
+ }
+ }
+
+ public long getObjectsLoadedCount() {
+ return objectLoadedCount.get();
+ }
+
+ public long getObjectLoadingTotalTime() {
+ return objectLoadTotalTime.get();
+ }
+
+ public long getObjectLoadingExecutionMaxTime() {
+ return objectLoadMaxTime.get();
+ }
+
+ public long getObjectLoadingExecutionAvgTime() {
+ writeLock.lock();
+ try {
+ long avgLoadingTime = 0;
+ if ( objectLoadedCount.get() > 0 ) {
+ avgLoadingTime = objectLoadTotalTime.get() / objectLoadedCount.get();
+ }
+ return avgLoadingTime;
+ }
+ finally {
+ writeLock.unlock();
+ }
+ }
+
+ public void objectLoadExecuted(long numberOfObjectsLoaded, long time) {
+ readLock.lock();
+ try {
+ for ( long old = objectLoadMaxTime.get();
+ ( time > old ) && ( objectLoadMaxTime.compareAndSet( old, time ) );
+ old = objectLoadMaxTime.get() ) {
+ ;
+ }
+ objectLoadedCount.addAndGet( numberOfObjectsLoaded );
+ objectLoadTotalTime.addAndGet( time );
+ }
+ finally {
+ readLock.unlock();
+ }
+ }
+
+ public boolean isStatisticsEnabled() {
+ return isStatisticsEnabled;
+ }
+
+ public void setStatisticsEnabled(boolean b) {
+ isStatisticsEnabled = b;
+ }
+
+ public String getSearchVersion() {
+ return Version.getVersionString();
+ }
+
+ public Set<String> getIndexedClassNames() {
+ Set<String> indexedClasses = new HashSet<String>();
+ for ( Class clazz : searchFactoryImplementor.getDocumentBuildersIndexedEntities().keySet() ) {
+ indexedClasses.add( clazz.getName() );
+ }
+ return indexedClasses;
+ }
+
+ public int getNumberOfIndexedEntities(String entity) {
+ Class<?> clazz = getEntityClass( entity );
+ DirectoryProvider[] directoryProviders = searchFactoryImplementor.getDirectoryProviders( clazz );
+ ReaderProvider readerProvider = searchFactoryImplementor.getReaderProvider();
+
+ int count = 0;
+ for ( DirectoryProvider directoryProvider : directoryProviders ) {
+ IndexReader reader = readerProvider.openReader( directoryProvider );
+ IndexSearcher searcher = new IndexSearcher( reader );
+ BooleanQuery boolQuery = new BooleanQuery();
+ boolQuery.add( new MatchAllDocsQuery(), BooleanClause.Occur.MUST );
+ boolQuery.add(
+ new TermQuery( new Term( ProjectionConstants.OBJECT_CLASS, entity ) ), BooleanClause.Occur.MUST
+ );
+ try {
+ TopDocs topdocs = searcher.search( boolQuery, 1 );
+ count += topdocs.totalHits;
+ }
+ catch ( IOException e ) {
+ throw new RuntimeException( "Unable to execute count query for entity " + entity, e );
+ }
+ finally {
+ readerProvider.closeReader( reader );
+ }
+ }
+ return count;
+ }
+
+ public Map<String, Integer> indexedEntitiesCount() {
+ Map<String, Integer> countPerEntity = new HashMap<String, Integer>();
+ for ( String className : getIndexedClassNames() ) {
+ countPerEntity.put( className, getNumberOfIndexedEntities( className ) );
+ }
+ return countPerEntity;
+ }
+
+ public List<String> getIndexingParameters(String entity) {
+ Class<?> clazz = getEntityClass( entity );
+ List<String> indexingParameters = new ArrayList<String>();
+ for ( DirectoryProvider directoryProvider : searchFactoryImplementor.getDirectoryProviders( clazz ) ) {
+ indexingParameters.add( searchFactoryImplementor.getIndexingParameters( directoryProvider ).toString() );
+ }
+ return indexingParameters;
+ }
+
+ private Class<?> getEntityClass(String entity) {
+ Class<?> clazz;
+ try {
+ clazz = ReflectHelper.classForName( entity, StatisticsImpl.class );
+ }
+ catch ( ClassNotFoundException e ) {
+ throw new IllegalArgumentException( entity + "not a indexed entity" );
+ }
+ return clazz;
+ }
+}
+
+
Copied: search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImplementor.java (from rev 20177, search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java)
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImplementor.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImplementor.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,35 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+// $Id:$
+package org.hibernate.search.stat;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface StatisticsImplementor {
+ void objectLoadExecuted(long numberOfObjectsLoaded, long time);
+
+ void searchExecuted(String searchString, long time);
+}
Deleted: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -1,149 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.test.jmx;
-
-import java.lang.management.ManagementFactory;
-import java.util.HashSet;
-import java.util.Set;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.search.Environment;
-import org.hibernate.search.FullTextSession;
-import org.hibernate.search.Search;
-import org.hibernate.search.jmx.ConfigInfoMBean;
-import org.hibernate.search.test.SearchTestCase;
-
-/**
- * @author Hardy Ferentschik
- */
-public class ConfigInfoMBeanTest extends SearchTestCase {
- MBeanServer mbeanServer;
- ObjectName configBeanObjectName;
-
- public void testConfigInfoMBeanRegistered() throws Exception {
- assertTrue(
- "With the right property set the Search MBean should be registered",
- mbeanServer.isRegistered( configBeanObjectName )
- );
- }
-
- public void testAttributesAndOperations() throws Exception {
- MBeanInfo info = mbeanServer.getMBeanInfo( configBeanObjectName );
- MBeanAttributeInfo[] attributes = info.getAttributes();
- assertEquals( "Wrong number of attributes", 3, attributes.length );
- Set<String> attributeNames = new HashSet<String>();
- attributeNames.add( "IndexedClassNames" );
- attributeNames.add( "IndexingStrategy" );
- attributeNames.add( "SearchVersion" );
- for ( MBeanAttributeInfo attribute : attributes ) {
- assertTrue( attributeNames.contains( attribute.getName() ) );
- }
-
- MBeanOperationInfo[] operations = info.getOperations();
- assertEquals( "Wrong number of operations", 3, operations.length );
- Set<String> operationNames = new HashSet<String>();
- operationNames.add( "getNumberOfIndexedEntities" );
- operationNames.add( "indexedEntitiesCount" );
- operationNames.add( "getIndexingParameters" );
- for ( MBeanOperationInfo operation : operations ) {
- assertTrue( operationNames.contains( operation.getName() ) );
- }
- }
-
- public void testIndexingStrategy() throws Exception {
- assertEquals(
- "wrong even type", "event", mbeanServer.getAttribute( configBeanObjectName, "IndexingStrategy" )
- );
- }
-
- public void testIndexedClassNames() throws Exception {
- assertEquals(
- "wrong class name",
- Counter.class.getName(),
- ( ( Set ) mbeanServer.getAttribute( configBeanObjectName, "IndexedClassNames" ) ).iterator().next()
- );
- }
-
-
- public void testNumberOfIndexedEntities() throws Exception {
- assertNumberOfIndexedEntities( Counter.class.getName(), 0 );
-
- FullTextSession s = Search.getFullTextSession( openSession() );
- Transaction tx = s.beginTransaction();
- Counter counter = new Counter();
- s.save( counter );
- tx.commit();
- s.close();
-
- assertNumberOfIndexedEntities( Counter.class.getName(), 1 );
- }
-
- private void assertNumberOfIndexedEntities(String entity, int count)
- throws InstanceNotFoundException, MBeanException, ReflectionException {
- assertEquals(
- "wrong number of indexed entities", count,
- mbeanServer.invoke(
- configBeanObjectName,
- "getNumberOfIndexedEntities",
- new String[] { entity },
- new String[] { String.class.getName() }
- )
- );
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- mbeanServer = ManagementFactory.getPlatformMBeanServer();
- configBeanObjectName = new ObjectName( ConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if ( mbeanServer.isRegistered( configBeanObjectName ) ) {
- mbeanServer.unregisterMBean( configBeanObjectName );
- }
- setCfg( null ); // force a rebuild of the configuration
- }
-
- protected void configure(Configuration cfg) {
- super.configure( cfg );
- cfg.setProperty( Environment.JMX_ENABLED, "true" );
- }
-
- @Override
- protected Class<?>[] getAnnotatedClasses() {
- return new Class<?>[] { Counter.class };
- }
-}
-
-
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -41,8 +41,8 @@
import org.hibernate.search.Environment;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
-import org.hibernate.search.jmx.ConfigInfoMBean;
import org.hibernate.search.jmx.IndexCtrlMBean;
+import org.hibernate.search.jmx.StatisticsInfoMBean;
import org.hibernate.search.test.SearchTestCase;
/**
@@ -50,7 +50,7 @@
*/
public class IndexCtrlMBeanTest extends SearchTestCase {
MBeanServer mbeanServer;
- ObjectName configBeanObjectName;
+ ObjectName statisticsBeanObjectName;
ObjectName indexBeanObjectName;
public void testIndexCtrlMBeanRegistered() throws Exception {
@@ -84,10 +84,6 @@
}
public void testIndexAndPurge() throws Exception {
- assertEquals(
- "wrong even type", "manual", mbeanServer.getAttribute( configBeanObjectName, "IndexingStrategy" )
- );
-
FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
Counter counter = new Counter();
@@ -117,21 +113,21 @@
}
protected void setUp() throws Exception {
+ setCfg( null ); // force a rebuild of the configuration
super.setUp();
mbeanServer = ManagementFactory.getPlatformMBeanServer();
- configBeanObjectName = new ObjectName( ConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
+ statisticsBeanObjectName = new ObjectName( StatisticsInfoMBean.STATISTICS_MBEAN_OBJECT_NAME );
indexBeanObjectName = new ObjectName( IndexCtrlMBean.INDEX_CTRL_MBEAN_OBJECT_NAME );
}
protected void tearDown() throws Exception {
super.tearDown();
- if ( mbeanServer.isRegistered( configBeanObjectName ) ) {
- mbeanServer.unregisterMBean( configBeanObjectName );
+ if ( mbeanServer.isRegistered( statisticsBeanObjectName ) ) {
+ mbeanServer.unregisterMBean( statisticsBeanObjectName );
}
if ( mbeanServer.isRegistered( indexBeanObjectName ) ) {
mbeanServer.unregisterMBean( indexBeanObjectName );
}
- setCfg( null ); // force a rebuild of the configuration
}
protected void configure(Configuration cfg) {
@@ -159,7 +155,7 @@
assertEquals(
"wrong number of indexed entities", count,
mbeanServer.invoke(
- configBeanObjectName,
+ statisticsBeanObjectName,
"getNumberOfIndexedEntities",
new String[] { entity },
new String[] { String.class.getName() }
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/NoMBeansEnabledTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/NoMBeansEnabledTest.java 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/NoMBeansEnabledTest.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -30,32 +30,32 @@
import org.hibernate.cfg.Configuration;
import org.hibernate.search.Environment;
-import org.hibernate.search.jmx.ConfigInfoMBean;
import org.hibernate.search.jmx.IndexCtrlMBean;
+import org.hibernate.search.jmx.StatisticsInfoMBean;
import org.hibernate.search.test.SearchTestCase;
/**
* @author Hardy Ferentschik
*/
public class NoMBeansEnabledTest extends SearchTestCase {
+ MBeanServer mbeanServer;
public void testMBeanNotRegisteredWithoutExplicitProperty() throws Exception {
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ mbeanServer = ManagementFactory.getPlatformMBeanServer();
- ObjectName name = new ObjectName( ConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
+ ObjectName name = new ObjectName( StatisticsInfoMBean.STATISTICS_MBEAN_OBJECT_NAME );
assertFalse(
"Without '" + Environment.JMX_ENABLED + "' set the configuration info MBean should not be registered",
- mbs.isRegistered( name )
+ mbeanServer.isRegistered( name )
);
name = new ObjectName( IndexCtrlMBean.INDEX_CTRL_MBEAN_OBJECT_NAME );
assertFalse(
"Without '" + Environment.JMX_ENABLED + "' set the index control MBean should not be registered",
- mbs.isRegistered( name )
+ mbeanServer.isRegistered( name )
);
}
-
protected void configure(Configuration cfg) {
super.configure( cfg );
File targetDir = getTargetDir();
@@ -66,10 +66,33 @@
cfg.setProperty( "hibernate.jndi.class", "org.osjava.sj.SimpleContextFactory" );
cfg.setProperty( "hibernate.jndi.org.osjava.sj.root", simpleJndiDir.getAbsolutePath() );
cfg.setProperty( "hibernate.jndi.org.osjava.sj.jndi.shared", "true" );
+ // not setting the property is effectively the same as setting is explicitly to false
+ // cfg.setProperty( Environment.JMX_ENABLED, "false" );
}
+ protected void setUp() throws Exception {
+ // make sure that no MBean is registered before the test runs
+ mbeanServer = ManagementFactory.getPlatformMBeanServer();
+ ObjectName statisticsBeanObjectName = new ObjectName( StatisticsInfoMBean.STATISTICS_MBEAN_OBJECT_NAME );
+ if ( mbeanServer.isRegistered( statisticsBeanObjectName ) ) {
+ mbeanServer.unregisterMBean( statisticsBeanObjectName );
+ }
+ ObjectName indexBeanObjectName = new ObjectName( IndexCtrlMBean.INDEX_CTRL_MBEAN_OBJECT_NAME );
+ if ( mbeanServer.isRegistered( indexBeanObjectName ) ) {
+ mbeanServer.unregisterMBean( indexBeanObjectName );
+ }
+
+ // build the new configuration
+ setCfg( null ); // force a rebuild of the configuration
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
@Override
protected Class<?>[] getAnnotatedClasses() {
- return new Class<?>[] { Counter.class };
+ return new Class<?>[] { };
}
}
\ No newline at end of file
Copied: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/Author.java (from rev 20177, search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java)
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/Author.java (rev 0)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/Author.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,78 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.test.proxy;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.annotations.Proxy;
+import org.hibernate.search.annotations.ContainedIn;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Entity
+@Indexed
+@Proxy(proxyClass = IAuthor.class)
+public class Author implements IAuthor {
+
+ private Integer id;
+ private String name;
+ private IBook book;
+
+ @Id
+ @GeneratedValue
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ @Field(index = Index.TOKENIZED)
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @ContainedIn
+ @ManyToOne(targetEntity = Book.class, fetch = FetchType.LAZY)
+ public IBook getBook() {
+ return book;
+ }
+
+ public void setBook(IBook book) {
+ this.book = book;
+ }
+}
Added: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/Book.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/Book.java (rev 0)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/Book.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,102 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.test.proxy;
+
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+import org.hibernate.annotations.Proxy;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Fields;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
+import org.hibernate.search.annotations.Store;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Entity
+@Indexed(index = "Book")
+@Proxy(proxyClass = IBook.class)
+public class Book implements IBook {
+
+ private Integer id;
+ private String body;
+ private String summary;
+ private Set<IAuthor> authors = new HashSet<IAuthor>();
+
+ public Book() {
+ }
+
+ public Book(Integer id, String summary, String body) {
+ this.id = id;
+ this.summary = summary;
+ this.body = body;
+ }
+
+ @Id
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ @OneToMany(targetEntity = Author.class, mappedBy = "book", cascade = CascadeType.ALL)
+ @IndexedEmbedded(targetElement = Author.class)
+ public Set<IAuthor> getAuthors() {
+ return authors;
+ }
+
+ public void setAuthors(Set<IAuthor> authors) {
+ this.authors = authors;
+ }
+
+ @Field(index = Index.TOKENIZED, store = Store.NO)
+ public String getBody() {
+ return body;
+ }
+
+ public void setBody(String body) {
+ this.body = body;
+ }
+
+ @Fields({
+ @Field(index = Index.TOKENIZED, store = Store.YES),
+ @Field(name = "summary_forSort", index = Index.UN_TOKENIZED, store = Store.YES)
+ })
+ public String getSummary() {
+ return summary;
+ }
+
+ public void setSummary(String summary) {
+ this.summary = summary;
+ }
+}
Copied: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/IAuthor.java (from rev 20177, search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java)
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/IAuthor.java (rev 0)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/IAuthor.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,32 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+// $Id:$
+package org.hibernate.search.test.proxy;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface IAuthor {
+}
Copied: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/IBook.java (from rev 20177, search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java)
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/IBook.java (rev 0)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/IBook.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,30 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.test.proxy;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface IBook {
+}
Added: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/ProxyTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/ProxyTest.java (rev 0)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/proxy/ProxyTest.java 2010-08-19 11:49:16 UTC (rev 20178)
@@ -0,0 +1,70 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.test.proxy;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.search.test.SearchTestCase;
+
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class ProxyTest extends SearchTestCase {
+
+ public void testProxy() throws Exception {
+ Session session = openSession();
+ Transaction tx = session.beginTransaction();
+ Book book = new Book(
+ 1,
+ "La chute de la petite reine a travers les yeux de Festina",
+ "La chute de la petite reine a travers les yeux de Festina, blahblah"
+ );
+ Author author = new Author();
+ author.setBook( book );
+ author.setName( "John Doe" );
+ Set<IAuthor> authors = new HashSet<IAuthor>();
+ authors.add( author );
+ book.setAuthors( authors );
+ session.save( book );
+ tx.commit();
+ session.clear();
+
+ tx = session.beginTransaction();
+ IAuthor loadedAuthor = ( IAuthor ) session.get( Author.class, author.getId() );
+ //author = (Author) loadedBook.getAuthors().iterator().next();
+ session.delete( loadedAuthor );
+
+ tx.commit();
+ session.close();
+ }
+
+ @Override
+ protected Class<?>[] getAnnotatedClasses() {
+ return new Class[] { Book.class, Author.class };
+ }
+}
Modified: search/trunk/hibernate-search-integrationtest/pom.xml
===================================================================
--- search/trunk/hibernate-search-integrationtest/pom.xml 2010-08-19 11:46:54 UTC (rev 20177)
+++ search/trunk/hibernate-search-integrationtest/pom.xml 2010-08-19 11:49:16 UTC (rev 20178)
@@ -12,7 +12,7 @@
<artifactId>hibernate-search-integrationtest</artifactId>
- <name>Hibernate Search integration test</name>
+ <name>Hibernate Search Integration Tests</name>
<description>Hibernate Search integration tests. In particular with Spring Framework and JTA</description>
<properties>
15 years, 4 months
- 1
- 0
Hibernate SVN: r20177 - in search/trunk/hibernate-search/src: test/java/org/hibernate/search/test/jmx and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-08-19 07:46:54 -0400 (Thu, 19 Aug 2010)
New Revision: 20177
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java
Log:
HSEARCH-278
Fixed tests after adding more attributes
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java 2010-08-19 11:45:48 UTC (rev 20176)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java 2010-08-19 11:46:54 UTC (rev 20177)
@@ -146,7 +146,8 @@
else if ( "manual".equals( indexingStrategy ) ) {
used = false;
}
- log.debug( "Hibernate Search event listeners mode " + (used ? "activated" : "desactivated") );
+
+ log.debug( "Hibernate Search event listeners " + (used ? "activated" : "deactivated") );
}
public SearchFactoryImplementor getSearchFactoryImplementor() {
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java 2010-08-19 11:45:48 UTC (rev 20176)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java 2010-08-19 11:46:54 UTC (rev 20177)
@@ -60,10 +60,11 @@
public void testAttributesAndOperations() throws Exception {
MBeanInfo info = mbeanServer.getMBeanInfo( configBeanObjectName );
MBeanAttributeInfo[] attributes = info.getAttributes();
- assertEquals( "Wrong number of attributes", 2, attributes.length );
+ assertEquals( "Wrong number of attributes", 3, attributes.length );
Set<String> attributeNames = new HashSet<String>();
attributeNames.add( "IndexedClassNames" );
attributeNames.add( "IndexingStrategy" );
+ attributeNames.add( "SearchVersion" );
for ( MBeanAttributeInfo attribute : attributes ) {
assertTrue( attributeNames.contains( attribute.getName() ) );
}
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java 2010-08-19 11:45:48 UTC (rev 20176)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java 2010-08-19 11:46:54 UTC (rev 20177)
@@ -63,13 +63,21 @@
public void testAttributesAndOperations() throws Exception {
MBeanInfo info = mbeanServer.getMBeanInfo( indexBeanObjectName );
MBeanAttributeInfo[] attributes = info.getAttributes();
- assertEquals( "Wrong number of attributes", 0, attributes.length );
+ assertEquals( "Wrong number of attributes", 3, attributes.length );
+ Set<String> attributeNames = new HashSet<String>();
+ attributeNames.add( "NumberOfObjectLoadingThreads" );
+ attributeNames.add( "NumberOfFetchingThreads" );
+ attributeNames.add( "BatchSize" );
+ for ( MBeanAttributeInfo attribute : attributes ) {
+ assertTrue( attributeNames.contains( attribute.getName() ) );
+ }
MBeanOperationInfo[] operations = info.getOperations();
- assertEquals( "Wrong number of operations", 2, operations.length );
+ assertEquals( "Wrong number of operations", 3, operations.length );
Set<String> operationNames = new HashSet<String>();
operationNames.add( "index" );
operationNames.add( "purge" );
+ operationNames.add( "optimize" );
for ( MBeanOperationInfo operation : operations ) {
assertTrue( operationNames.contains( operation.getName() ) );
}
15 years, 4 months
- 1
- 0
Hibernate SVN: r20176 - in search/trunk/hibernate-search/src: main/java/org/hibernate/search/impl and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-08-19 07:45:48 -0400 (Thu, 19 Aug 2010)
New Revision: 20176
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/Environment.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/SearchFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java
Log:
HSEARCH-278 Introduced a Statistics interface and implementation. Also exposed it via JMX
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/Environment.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/Environment.java 2010-08-19 11:44:21 UTC (rev 20175)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/Environment.java 2010-08-19 11:45:48 UTC (rev 20176)
@@ -121,9 +121,13 @@
public static final String ERROR_HANDLER = "hibernate.search.error_handler";
/**
- * If set to {@code true} the JMX Statistics bean gets enabled. For all other values the bean does not
+ * If set to {@code true} JMX beans get enabled. For all other values the beans do not.
* get enabled.
*/
public static final String JMX_ENABLED = "hibernate.search.jmx_enabled";
+ /**
+ * If set to {@code true} the search statistic will be gathered.
+ */
+ public static final String GENERATE_STATS = "hibernate.search.generate_statistics";
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/SearchFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/SearchFactory.java 2010-08-19 11:44:21 UTC (rev 20175)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/SearchFactory.java 2010-08-19 11:45:48 UTC (rev 20176)
@@ -28,10 +28,12 @@
import org.hibernate.search.query.dsl.v2.QueryContextBuilder;
import org.hibernate.search.reader.ReaderProvider;
+import org.hibernate.search.stat.Statistics;
import org.hibernate.search.store.DirectoryProvider;
/**
* Provide application wide operations as well as access to the underlying Lucene resources.
+ *
* @author Emmanuel Bernard
*/
public interface SearchFactory {
@@ -63,18 +65,20 @@
/**
* Experimental API
* retrieve an analyzer instance by its definition name
- *
+ *
* @throws SearchException if the definition name is unknown
*/
Analyzer getAnalyzer(String name);
-
+
/**
* Retrieves the scoped analyzer for a given class.
- *
+ *
* @param clazz The class for which to retrieve the analyzer.
+ *
* @return The scoped analyzer for the specified class.
+ *
* @throws IllegalArgumentException in case <code>clazz == null</code> or the specified
- * class is not an indexed entity.
+ * class is not an indexed entity.
*/
Analyzer getAnalyzer(Class<?> clazz);
@@ -82,4 +86,11 @@
* Return a query builder providing a fluent API to create Lucene queries
*/
QueryContextBuilder buildQueryBuilder();
+
+ /**
+ * Retrieve the statistics for this factory.
+ *
+ * @return The statistics.
+ */
+ public Statistics getStatistics();
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java 2010-08-19 11:44:21 UTC (rev 20175)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java 2010-08-19 11:45:48 UTC (rev 20176)
@@ -56,6 +56,9 @@
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.exception.ErrorHandler;
import org.hibernate.search.filter.FilterCachingStrategy;
+import org.hibernate.search.jmx.JMXRegistrar;
+import org.hibernate.search.jmx.StatisticsImpl;
+import org.hibernate.search.jmx.StatisticsImplMBean;
import org.hibernate.search.query.dsl.v2.QueryContextBuilder;
import org.hibernate.search.query.dsl.v2.impl.ConnectedQueryContextBuilder;
import org.hibernate.search.reader.ReaderProvider;
@@ -63,6 +66,7 @@
import org.hibernate.search.spi.internals.DirectoryProviderData;
import org.hibernate.search.spi.internals.PolymorphicIndexHierarchy;
import org.hibernate.search.spi.internals.StateSearchFactoryImplementor;
+import org.hibernate.search.stat.Statistics;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.optimization.OptimizerStrategy;
import org.hibernate.search.util.LoggerFactory;
@@ -97,6 +101,7 @@
private final Properties configurationProperties;
private final ErrorHandler errorHandler;
private final PolymorphicIndexHierarchy indexHierarchy;
+ private final Statistics statistics;
/**
* Each directory provider (index) can have its own performance settings.
@@ -120,6 +125,16 @@
this.indexingStrategy = cfg.indexingStrategy;
this.readerProvider = cfg.readerProvider;
this.worker = cfg.worker;
+ this.statistics = new StatisticsImpl();
+ String enableStats = configurationProperties.getProperty( Environment.JMX_ENABLED );
+ if ( "true".equalsIgnoreCase( enableStats ) ) {
+ statistics.setStatisticsEnabled( true );
+ }
+
+ String enableJMX = configurationProperties.getProperty( Environment.JMX_ENABLED );
+ if ( "true".equalsIgnoreCase( enableJMX ) ) {
+ JMXRegistrar.registerMBean( statistics, StatisticsImplMBean.STATISTICS_MBEAN_OBJECT_NAME );
+ }
}
public BackendQueueProcessorFactory getBackendQueueProcessorFactory() {
@@ -264,6 +279,10 @@
return new ConnectedQueryContextBuilder( this );
}
+ public Statistics getStatistics() {
+ return statistics;
+ }
+
public FilterCachingStrategy getFilterCachingStrategy() {
return filterCachingStrategy;
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java 2010-08-19 11:44:21 UTC (rev 20175)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java 2010-08-19 11:45:48 UTC (rev 20176)
@@ -25,6 +25,7 @@
import org.hibernate.search.spi.internals.DirectoryProviderData;
import org.hibernate.search.spi.internals.PolymorphicIndexHierarchy;
import org.hibernate.search.spi.internals.StateSearchFactoryImplementor;
+import org.hibernate.search.stat.Statistics;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.optimization.OptimizerStrategy;
@@ -180,6 +181,10 @@
return delegate.buildQueryBuilder();
}
+ public Statistics getStatistics() {
+ return delegate.getStatistics();
+ }
+
public Map<Class<?>, DocumentBuilderContainedEntity<?>> getDocumentBuildersContainedEntities() {
return delegate.getDocumentBuildersContainedEntities();
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java 2010-08-19 11:44:21 UTC (rev 20175)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java 2010-08-19 11:45:48 UTC (rev 20176)
@@ -24,41 +24,60 @@
package org.hibernate.search.jmx;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.hibernate.search.jmx.StatisticsImplMBean;
-import org.hibernate.search.stat.Statistics;
-
/**
* @author Hardy Ferentschik
*/
-public class StatisticsImpl implements Statistics, StatisticsImplMBean {
+public class StatisticsImpl implements StatisticsImplMBean {
private AtomicLong searchQueryCount = new AtomicLong();
- private AtomicLong searchExecutionAvgTime = new AtomicLong();
private AtomicLong searchExecutionTotalTime = new AtomicLong();
private AtomicLong searchExecutionMaxTime = new AtomicLong();
- private AtomicLong searchExecutionMinTime = new AtomicLong();
private volatile String queryExecutionMaxTimeQueryString;
private volatile boolean isStatisticsEnabled;
+ private final Lock readLock;
+ private final Lock writeLock;
+ {
+ ReadWriteLock lock = new ReentrantReadWriteLock();
+ readLock = lock.readLock();
+ writeLock = lock.writeLock();
+ }
+
public void clear() {
searchQueryCount.set( 0 );
+ searchExecutionTotalTime.set( 0 );
+ searchExecutionMaxTime.set( 0 );
+ queryExecutionMaxTimeQueryString = "";
}
public long getSearchQueryExecutionCount() {
return searchQueryCount.get();
}
+ public long getSearchQueryTotalTime() {
+ return searchExecutionTotalTime.get();
+ }
+
public long getSearchQueryExecutionMaxTime() {
return searchExecutionMaxTime.get();
}
- public long getSearchQueryExecutionMinTime() {
- return searchExecutionMinTime.get();
- }
-
public long getSearchQueryExecutionAvgTime() {
- return searchExecutionAvgTime.get();
+ writeLock.lock();
+ try {
+ long avgExecutionTime = 0;
+ if ( searchQueryCount.get() > 0 ) {
+ avgExecutionTime = searchExecutionTotalTime.get() / searchQueryCount.get();
+ }
+ return avgExecutionTime;
+ }
+ finally {
+ writeLock.unlock();
+ }
}
public String getSearchQueryExecutionMaxTimeQueryString() {
@@ -66,26 +85,23 @@
}
public void searchExecuted(String searchString, long time) {
- searchQueryCount.getAndIncrement();
- boolean isLongestQuery = false;
- for ( long old = searchExecutionMaxTime.get();
- ( time > old ) && ( isLongestQuery = !searchExecutionMaxTime.compareAndSet( old, time ) );
- old = searchExecutionMaxTime.get() ) {
- ;
+ readLock.lock();
+ try {
+ boolean isLongestQuery = false;
+ for ( long old = searchExecutionMaxTime.get();
+ ( time > old ) && ( isLongestQuery = searchExecutionMaxTime.compareAndSet( old, time ) );
+ old = searchExecutionMaxTime.get() ) {
+ ;
+ }
+ if ( isLongestQuery ) {
+ queryExecutionMaxTimeQueryString = searchString;
+ }
+ searchQueryCount.getAndIncrement();
+ searchExecutionTotalTime.addAndGet( time );
}
- if ( isLongestQuery ) {
- queryExecutionMaxTimeQueryString = searchString;
+ finally {
+ readLock.unlock();
}
-
- boolean isShortestQuery = false;
- for ( long old = searchExecutionMinTime.get();
- ( time < old ) && ( isShortestQuery = !searchExecutionMinTime.compareAndSet( old, time ) );
- old = searchExecutionMinTime.get() ) {
- ;
- }
-
- searchExecutionTotalTime.getAndAdd( time );
- searchExecutionAvgTime.getAndSet( searchExecutionTotalTime.get() / searchQueryCount.get() );
}
public boolean isStatisticsEnabled() {
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-08-19 11:44:21 UTC (rev 20175)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-08-19 11:45:48 UTC (rev 20176)
@@ -53,11 +53,11 @@
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
import org.hibernate.Query;
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
-import org.hibernate.LockOptions;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.engine.query.ParameterMetadata;
import org.hibernate.impl.AbstractQueryImpl;
@@ -77,24 +77,21 @@
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.filter.ChainedFilter;
import org.hibernate.search.filter.FilterKey;
-import org.hibernate.search.filter.StandardFilterKey;
import org.hibernate.search.filter.FullTextFilterImplementor;
import org.hibernate.search.filter.ShardSensitiveOnlyFilter;
+import org.hibernate.search.filter.StandardFilterKey;
import org.hibernate.search.reader.ReaderProvider;
-
-import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
-
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.IndexShardingStrategy;
import org.hibernate.search.util.ContextHelper;
+import org.hibernate.search.util.LoggerFactory;
+import org.hibernate.transform.ResultTransformer;
+import org.hibernate.util.ReflectHelper;
+import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheInstance;
import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheResults;
-import org.hibernate.search.util.LoggerFactory;
-import org.hibernate.transform.ResultTransformer;
-import org.hibernate.util.ReflectHelper;
-
/**
* Implementation of {@link org.hibernate.search.FullTextQuery}.
*
@@ -401,6 +398,13 @@
org.apache.lucene.search.Query query = filterQueryByClasses( luceneQuery );
buildFilters();
QueryHits queryHits;
+
+ boolean stats = searchFactoryImplementor.getStatistics().isStatisticsEnabled();
+ long startTime = 0;
+ if ( stats ) {
+ startTime = System.currentTimeMillis();
+ }
+
if ( n == null ) { // try to make sure that we get the right amount of top docs
queryHits = new QueryHits( searcher, query, filter, sort );
}
@@ -408,6 +412,11 @@
queryHits = new QueryHits( searcher, query, filter, sort, n );
}
resultSize = queryHits.totalHits;
+
+ if ( stats ) {
+ searchFactoryImplementor.getStatistics().searchExecuted( query.toString(), System.currentTimeMillis() - startTime );
+ }
+
return queryHits;
}
@@ -902,10 +911,10 @@
}
public <T> T unwrap(Class<T> type) {
- if ( type == org.apache.lucene.search.Query.class) {
- return (T) luceneQuery;
+ if ( type == org.apache.lucene.search.Query.class ) {
+ return ( T ) luceneQuery;
}
- throw new IllegalArgumentException("Cannot unwrap " + type.getName() );
+ throw new IllegalArgumentException( "Cannot unwrap " + type.getName() );
}
public LockOptions getLockOptions() {
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java 2010-08-19 11:44:21 UTC (rev 20175)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java 2010-08-19 11:45:48 UTC (rev 20176)
@@ -1,10 +1,75 @@
-// $Id:$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.search.stat;
/**
* @author Hardy Ferentschik
*/
-public class Statistics {
+public interface Statistics {
+ /**
+ * Reset all statistics.
+ */
+ void clear();
+
+ /**
+ * Get global number of executed search queries
+ *
+ * @return search query execution count
+ */
+ long getSearchQueryExecutionCount();
+
+ /**
+ * Get the total search time in milliseconds.
+ */
+ long getSearchQueryTotalTime();
+
+ /**
+ * Get the time in milliseconds of the slowest search.
+ */
+ long getSearchQueryExecutionMaxTime();
+
+ /**
+ * Get the average search time in milliseconds.
+ */
+ long getSearchQueryExecutionAvgTime();
+
+ /**
+ * Get the query string for the slowest query.
+ */
+ String getSearchQueryExecutionMaxTimeQueryString();
+
+ void searchExecuted(String searchString, long time);
+
+ /**
+ * Are statistics logged
+ */
+ public boolean isStatisticsEnabled();
+
+ /**
+ * Enable statistics logs (this is a dynamic parameter)
+ */
+ public void setStatisticsEnabled(boolean b);
}
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java 2010-08-19 11:44:21 UTC (rev 20175)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java 2010-08-19 11:45:48 UTC (rev 20176)
@@ -70,6 +70,7 @@
.setProperty( "hibernate.jndi.org.osjava.sj.root", "/Users/hardy/tmp/jndi-entries" )
.setProperty( "hibernate.jndi.org.osjava.sj.jndi.shared", "true" )
.setProperty( Environment.JMX_ENABLED, "true" )
+ .setProperty( Environment.GENERATE_STATS, "true" )
.build();
createMany( Book.class, BOOK_NUM );
createMany( Dvd.class, DVD_NUM );
15 years, 4 months
- 1
- 0
Hibernate SVN: r20175 - in search/trunk/hibernate-search/src/main/java/org/hibernate/search: jmx and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-08-19 07:44:21 -0400 (Thu, 19 Aug 2010)
New Revision: 20175
Added:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/
search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java
Log:
HSEARCH-278 Introduced a Statistics interface and implementation. Also exposed it via JMX
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImpl.java 2010-08-19 11:44:21 UTC (rev 20175)
@@ -0,0 +1,100 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.jmx;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.hibernate.search.jmx.StatisticsImplMBean;
+import org.hibernate.search.stat.Statistics;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class StatisticsImpl implements Statistics, StatisticsImplMBean {
+ private AtomicLong searchQueryCount = new AtomicLong();
+ private AtomicLong searchExecutionAvgTime = new AtomicLong();
+ private AtomicLong searchExecutionTotalTime = new AtomicLong();
+ private AtomicLong searchExecutionMaxTime = new AtomicLong();
+ private AtomicLong searchExecutionMinTime = new AtomicLong();
+ private volatile String queryExecutionMaxTimeQueryString;
+ private volatile boolean isStatisticsEnabled;
+
+
+ public void clear() {
+ searchQueryCount.set( 0 );
+ }
+
+ public long getSearchQueryExecutionCount() {
+ return searchQueryCount.get();
+ }
+
+ public long getSearchQueryExecutionMaxTime() {
+ return searchExecutionMaxTime.get();
+ }
+
+ public long getSearchQueryExecutionMinTime() {
+ return searchExecutionMinTime.get();
+ }
+
+ public long getSearchQueryExecutionAvgTime() {
+ return searchExecutionAvgTime.get();
+ }
+
+ public String getSearchQueryExecutionMaxTimeQueryString() {
+ return queryExecutionMaxTimeQueryString;
+ }
+
+ public void searchExecuted(String searchString, long time) {
+ searchQueryCount.getAndIncrement();
+ boolean isLongestQuery = false;
+ for ( long old = searchExecutionMaxTime.get();
+ ( time > old ) && ( isLongestQuery = !searchExecutionMaxTime.compareAndSet( old, time ) );
+ old = searchExecutionMaxTime.get() ) {
+ ;
+ }
+ if ( isLongestQuery ) {
+ queryExecutionMaxTimeQueryString = searchString;
+ }
+
+ boolean isShortestQuery = false;
+ for ( long old = searchExecutionMinTime.get();
+ ( time < old ) && ( isShortestQuery = !searchExecutionMinTime.compareAndSet( old, time ) );
+ old = searchExecutionMinTime.get() ) {
+ ;
+ }
+
+ searchExecutionTotalTime.getAndAdd( time );
+ searchExecutionAvgTime.getAndSet( searchExecutionTotalTime.get() / searchQueryCount.get() );
+ }
+
+ public boolean isStatisticsEnabled() {
+ return isStatisticsEnabled;
+ }
+
+ public void setStatisticsEnabled(boolean b) {
+ isStatisticsEnabled = b;
+ }
+}
+
+
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/StatisticsImplMBean.java 2010-08-19 11:44:21 UTC (rev 20175)
@@ -0,0 +1,37 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+
+// $Id:$
+package org.hibernate.search.jmx;
+
+import org.hibernate.search.stat.Statistics;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface StatisticsImplMBean extends Statistics {
+ public static final String STATISTICS_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=StatisticsMBean";
+}
+
+
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/stat/Statistics.java 2010-08-19 11:44:21 UTC (rev 20175)
@@ -0,0 +1,10 @@
+// $Id:$
+package org.hibernate.search.stat;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class Statistics {
+}
+
+
15 years, 4 months
- 1
- 0
Hibernate SVN: r20174 - in search/trunk/hibernate-search/src: main/java/org/hibernate/search/impl and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-08-19 07:43:20 -0400 (Thu, 19 Aug 2010)
New Revision: 20174
Added:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfo.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfoMBean.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexCtrl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexCtrlMBean.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitor.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitorMBean.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/JMXRegistrar.java
Removed:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfo.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfoMBean.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrlMBean.java
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/FullTextSessionImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/NoMBeansEnabledTest.java
Log:
HSEARCH-278 Added a MBean to monitor the mass indexing progress. Introduced JMXRegistrar and did some refactoring of existing JMX code
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -29,17 +29,16 @@
import java.util.concurrent.locks.ReentrantLock;
import org.apache.lucene.search.Similarity;
-import org.hibernate.search.SearchFactory;
+
import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.LuceneIndexingParameters;
-import org.hibernate.search.backend.Worker;
import org.hibernate.search.backend.impl.batchlucene.BatchBackend;
import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
+import org.hibernate.search.exception.ErrorHandler;
import org.hibernate.search.filter.FilterCachingStrategy;
import org.hibernate.search.spi.SearchFactoryIntegrator;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.optimization.OptimizerStrategy;
-import org.hibernate.search.exception.ErrorHandler;
/**
* Interface which gives access to the different directory providers and their configuration.
@@ -75,7 +74,7 @@
int getFilterCacheBitResultsSize();
Set<Class<?>> getIndexedTypesPolymorphic(Class<?>[] classes);
-
+
BatchBackend makeBatchBackend(MassIndexerProgressMonitor progressMonitor);
Similarity getSimilarity(DirectoryProvider<?> directoryProvider);
@@ -83,5 +82,4 @@
boolean isExclusiveIndexUsageEnabled(DirectoryProvider<?> provider);
ErrorHandler getErrorHandler();
-
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/FullTextSessionImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/FullTextSessionImpl.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/FullTextSessionImpl.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -29,33 +29,39 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import org.slf4j.Logger;
+
import org.hibernate.CacheMode;
import org.hibernate.SessionFactory;
+import org.hibernate.search.Environment;
import org.hibernate.search.MassIndexer;
import org.hibernate.search.batchindexing.BatchCoordinator;
import org.hibernate.search.batchindexing.Executors;
import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.jmx.IndexingProgressMonitorMBean;
+import org.hibernate.search.jmx.IndexingProgressMonitor;
+import org.hibernate.search.jmx.JMXRegistrar;
+import org.hibernate.search.spi.internals.StateSearchFactoryImplementor;
import org.hibernate.search.util.LoggerFactory;
-import org.slf4j.Logger;
/**
* Prepares and configures a BatchIndexingWorkspace to start rebuilding
* the indexes for all entity instances in the database.
* The type of these entities is either all indexed entities or a
* subset, always including all subtypes.
- *
+ *
* @author Sanne Grinovero
*/
public class MassIndexerImpl implements MassIndexer {
-
+
private static final Logger log = LoggerFactory.make();
-
+
private final SearchFactoryImplementor searchFactoryImplementor;
private final SessionFactory sessionFactory;
protected Set<Class<?>> rootEntities = new HashSet<Class<?>>();
-
+
// default settings defined here:
private int objectLoadingThreads = 2; //loading the main entity
private int collectionLoadingThreads = 4; //also responsible for loading of lazy @IndexedEmbedded collections
@@ -68,23 +74,41 @@
private boolean optimizeAfterPurge = true;
private MassIndexerProgressMonitor monitor = new SimpleIndexingProgressMonitor();
- protected MassIndexerImpl(SearchFactoryImplementor searchFactory, SessionFactory sessionFactory, Class<?>...entities) {
+ protected MassIndexerImpl(SearchFactoryImplementor searchFactory, SessionFactory sessionFactory, Class<?>... entities) {
this.searchFactoryImplementor = searchFactory;
this.sessionFactory = sessionFactory;
rootEntities = toRootEntities( searchFactoryImplementor, entities );
+
+ if ( searchFactory instanceof StateSearchFactoryImplementor ) {
+ StateSearchFactoryImplementor stateSearchFactoryImplementor = ( StateSearchFactoryImplementor ) searchFactory;
+ String enableJMX = stateSearchFactoryImplementor.getConfigurationProperties()
+ .getProperty( Environment.JMX_ENABLED );
+ if ( "true".equalsIgnoreCase( enableJMX ) ) {
+ monitor = new IndexingProgressMonitor();
+ JMXRegistrar.registerMBean(
+ monitor, IndexingProgressMonitorMBean.INDEXING_PROGRESS_MONITOR_MBEAN_OBJECT_NAME
+ );
+ }
+ }
}
/**
* From the set of classes a new set is built containing all indexed
* subclasses, but removing then all subtypes of indexed entities.
+ *
* @param selection
+ *
* @return a new set of entities
*/
private static Set<Class<?>> toRootEntities(SearchFactoryImplementor searchFactoryImplementor, Class<?>... selection) {
Set<Class<?>> entities = new HashSet<Class<?>>();
//first build the "entities" set containing all indexed subtypes of "selection".
- for (Class<?> entityType : selection) {
- Set<Class<?>> targetedClasses = searchFactoryImplementor.getIndexedTypesPolymorphic( new Class[] {entityType} );
+ for ( Class<?> entityType : selection ) {
+ Set<Class<?>> targetedClasses = searchFactoryImplementor.getIndexedTypesPolymorphic(
+ new Class[] {
+ entityType
+ }
+ );
if ( targetedClasses.isEmpty() ) {
String msg = entityType.getName() + " is not an indexed entity or a subclass of an indexed entity";
throw new IllegalArgumentException( msg );
@@ -94,9 +118,9 @@
Set<Class<?>> cleaned = new HashSet<Class<?>>();
Set<Class<?>> toRemove = new HashSet<Class<?>>();
//now remove all repeated types to avoid duplicate loading by polymorphic query loading
- for (Class<?> type : entities) {
+ for ( Class<?> type : entities ) {
boolean typeIsOk = true;
- for (Class<?> existing : cleaned) {
+ for ( Class<?> existing : cleaned ) {
if ( existing.isAssignableFrom( type ) ) {
typeIsOk = false;
break;
@@ -115,33 +139,37 @@
}
public MassIndexer cacheMode(CacheMode cacheMode) {
- if ( cacheMode == null )
+ if ( cacheMode == null ) {
throw new IllegalArgumentException( "cacheMode must not be null" );
+ }
this.cacheMode = cacheMode;
return this;
}
public MassIndexer threadsToLoadObjects(int numberOfThreads) {
- if ( numberOfThreads < 1 )
+ if ( numberOfThreads < 1 ) {
throw new IllegalArgumentException( "numberOfThreads must be at least 1" );
+ }
this.objectLoadingThreads = numberOfThreads;
return this;
}
-
+
public MassIndexer batchSizeToLoadObjects(int batchSize) {
- if ( batchSize < 1 )
+ if ( batchSize < 1 ) {
throw new IllegalArgumentException( "batchSize must be at least 1" );
+ }
this.objectLoadingBatchSize = batchSize;
return this;
}
-
+
public MassIndexer threadsForSubsequentFetching(int numberOfThreads) {
- if ( numberOfThreads < 1 )
+ if ( numberOfThreads < 1 ) {
throw new IllegalArgumentException( "numberOfThreads must be at least 1" );
+ }
this.collectionLoadingThreads = numberOfThreads;
return this;
}
-
+
//TODO see MassIndexer interface
// public MassIndexer threadsForIndexWriter(int numberOfThreads) {
// if ( numberOfThreads < 1 )
@@ -149,7 +177,7 @@
// this.writerThreads = numberOfThreads;
// return this;
// }
-
+
public MassIndexer optimizeOnFinish(boolean optimize) {
this.optimizeAtEnd = optimize;
return this;
@@ -164,7 +192,7 @@
this.purgeAtStart = purgeAll;
return this;
}
-
+
public Future<?> start() {
BatchCoordinator coordinator = createCoordinator();
ExecutorService executor = Executors.newFixedThreadPool( 1, "batch coordinator" );
@@ -176,7 +204,7 @@
executor.shutdown();
}
}
-
+
public void startAndWait() throws InterruptedException {
BatchCoordinator coordinator = createCoordinator();
coordinator.run();
@@ -184,13 +212,15 @@
throw new InterruptedException();
}
}
-
+
protected BatchCoordinator createCoordinator() {
- return new BatchCoordinator( rootEntities, searchFactoryImplementor, sessionFactory,
+ return new BatchCoordinator(
+ rootEntities, searchFactoryImplementor, sessionFactory,
objectLoadingThreads, collectionLoadingThreads,
cacheMode, objectLoadingBatchSize, objectsLimit,
optimizeAtEnd, purgeAtStart, optimizeAfterPurge,
- monitor );
+ monitor
+ );
}
public MassIndexer limitIndexedObjectsTo(long maximum) {
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -24,7 +24,6 @@
package org.hibernate.search.impl;
import java.beans.Introspector;
-import java.lang.management.ManagementFactory;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
@@ -36,9 +35,6 @@
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.search.Similarity;
@@ -78,9 +74,10 @@
import org.hibernate.search.filter.FilterCachingStrategy;
import org.hibernate.search.filter.MRUFilterCachingStrategy;
import org.hibernate.search.filter.ShardSensitiveOnlyFilter;
-import org.hibernate.search.jmx.HibernateSearchConfigInfo;
-import org.hibernate.search.jmx.HibernateSearchConfigInfoMBean;
-import org.hibernate.search.jmx.HibernateSearchIndexCtrl;
+import org.hibernate.search.jmx.ConfigInfo;
+import org.hibernate.search.jmx.ConfigInfoMBean;
+import org.hibernate.search.jmx.IndexCtrl;
+import org.hibernate.search.jmx.JMXRegistrar;
import org.hibernate.search.reader.ReaderProvider;
import org.hibernate.search.reader.ReaderProviderFactory;
import org.hibernate.search.spi.WorkerBuildContext;
@@ -167,48 +164,16 @@
}
private void enableJMXStatistics(SearchFactoryImplementor searchFactoryImplementor) {
- HibernateSearchConfigInfo statsBean = new HibernateSearchConfigInfo( searchFactoryImplementor );
- ObjectName name = createObjectName( HibernateSearchConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
- registerMBean( statsBean, name );
+ ConfigInfo configInfoBean = new ConfigInfo( searchFactoryImplementor );
+ JMXRegistrar.registerMBean( configInfoBean, ConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
// if we have a JNDI bound SessionFactory we can also enable the index control bean
if ( StringHelper.isNotEmpty( configurationProperties.getProperty( "hibernate.session_factory_name" ) ) ) {
- HibernateSearchIndexCtrl indexCtrlBean = new HibernateSearchIndexCtrl( configurationProperties );
- name = createObjectName( HibernateSearchIndexCtrl.INDEX_CTRL_MBEAN_OBJECT_NAME );
- registerMBean( indexCtrlBean, name );
+ IndexCtrl indexCtrlBean = new IndexCtrl( configurationProperties );
+ JMXRegistrar.registerMBean( indexCtrlBean, IndexCtrl.INDEX_CTRL_MBEAN_OBJECT_NAME );
}
}
- private ObjectName createObjectName(String name) {
- ObjectName objectName;
- try {
- objectName = new ObjectName( name );
- }
- catch ( MalformedObjectNameException e ) {
- throw new SearchException( "Invalid JMX Bean name: " + name, e );
- }
- return objectName;
- }
-
- private void registerMBean(Object stats, ObjectName name) {
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- if ( mbs.isRegistered( name ) ) {
- try {
- mbs.unregisterMBean( name );
- }
- catch ( Exception e ) {
- log.warn( "Unable to un-register existing MBean: " + name, e );
- }
- }
-
- try {
- mbs.registerMBean( stats, name );
- }
- catch ( Exception e ) {
- throw new SearchException( "Unable to enable MBean for Hibernate Search", e );
- }
- }
-
private SearchFactoryImplementor buildIncrementalSearchFactory() {
removeClassesAlreadyManaged();
if ( classes.size() == 0 ) {
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -26,17 +26,18 @@
import java.util.concurrent.atomic.AtomicLong;
+import org.slf4j.Logger;
+
import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
import org.hibernate.search.util.LoggerFactory;
-import org.slf4j.Logger;
/**
- * A very simple implementation of MassIndexerProgressMonitor
- *
+ * A very simple implementation of {@code MassIndexerProgressMonitor}
+ *
* @author Sanne Grinovero
*/
public class SimpleIndexingProgressMonitor implements MassIndexerProgressMonitor {
-
+
private static final Logger log = LoggerFactory.make();
private final AtomicLong documentsDoneCounter = new AtomicLong();
private final AtomicLong totalCounter = new AtomicLong();
@@ -64,17 +65,16 @@
totalCounter.addAndGet( count );
log.info( "Going to reindex {} entities", count );
}
-
+
protected int getStatusMessagePeriod() {
return 50;
}
-
+
protected void printStatusMessage(long starttimems, long totalTodoCount, long doneCount) {
long elapsedMs = System.currentTimeMillis() - starttimems;
log.info( "{} documents indexed in {} ms", doneCount, elapsedMs );
- float estimateSpeed = doneCount * 1000f / elapsedMs ;
- float estimatePercentileComplete = doneCount * 100f / totalTodoCount ;
+ float estimateSpeed = doneCount * 1000f / elapsedMs;
+ float estimatePercentileComplete = doneCount * 100f / totalTodoCount;
log.info( "Indexing speed: {} documents/second; progress: {}%", estimateSpeed, estimatePercentileComplete );
}
-
}
Copied: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfo.java (from rev 20091, search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfo.java)
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfo.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfo.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -0,0 +1,136 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.jmx;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
+
+import org.hibernate.search.ProjectionConstants;
+import org.hibernate.search.Version;
+import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.reader.ReaderProvider;
+import org.hibernate.search.store.DirectoryProvider;
+import org.hibernate.util.ReflectHelper;
+
+/**
+ * Implementation of the {@code ConfigInfoMBean} JMX attributes and operations.
+ *
+ * @author Hardy Ferentschik
+ */
+public class ConfigInfo implements ConfigInfoMBean {
+
+ private final SearchFactoryImplementor searchFactoryImplementor;
+
+ public ConfigInfo(SearchFactoryImplementor searchFactoryImplementor) {
+ this.searchFactoryImplementor = searchFactoryImplementor;
+ }
+
+ public String getSearchVersion() {
+ return Version.getVersionString();
+ }
+
+ public Set<String> getIndexedClassNames() {
+ Set<String> indexedClasses = new HashSet<String>();
+ for ( Class clazz : searchFactoryImplementor.getDocumentBuildersIndexedEntities().keySet() ) {
+ indexedClasses.add( clazz.getName() );
+ }
+ return indexedClasses;
+ }
+
+ public String getIndexingStrategy() {
+ return searchFactoryImplementor.getIndexingStrategy();
+ }
+
+ public int getNumberOfIndexedEntities(String entity) {
+ Class<?> clazz = getEntityClass( entity );
+ DirectoryProvider[] directoryProviders = searchFactoryImplementor.getDirectoryProviders( clazz );
+ ReaderProvider readerProvider = searchFactoryImplementor.getReaderProvider();
+
+ int count = 0;
+ for ( DirectoryProvider directoryProvider : directoryProviders ) {
+ IndexReader reader = readerProvider.openReader( directoryProvider );
+ IndexSearcher searcher = new IndexSearcher( reader );
+ BooleanQuery boolQuery = new BooleanQuery();
+ boolQuery.add( new MatchAllDocsQuery(), BooleanClause.Occur.MUST );
+ boolQuery.add(
+ new TermQuery( new Term( ProjectionConstants.OBJECT_CLASS, entity ) ), BooleanClause.Occur.MUST
+ );
+ try {
+ TopDocs topdocs = searcher.search( boolQuery, 1 );
+ count += topdocs.totalHits;
+ }
+ catch ( IOException e ) {
+ throw new RuntimeException( "Unable to execute count query for entity " + entity, e );
+ }
+ finally {
+ readerProvider.closeReader( reader );
+ }
+ }
+ return count;
+ }
+
+ public Map<String, Integer> indexedEntitiesCount() {
+ Map<String, Integer> countPerEntity = new HashMap<String, Integer>();
+ for ( String className : getIndexedClassNames() ) {
+ countPerEntity.put( className, getNumberOfIndexedEntities( className ) );
+ }
+ return countPerEntity;
+ }
+
+ public List<String> getIndexingParameters(String entity) {
+ Class<?> clazz = getEntityClass( entity );
+ List<String> indexingParameters = new ArrayList<String>();
+ for ( DirectoryProvider directoryProvider : searchFactoryImplementor.getDirectoryProviders( clazz ) ) {
+ indexingParameters.add( searchFactoryImplementor.getIndexingParameters( directoryProvider ).toString() );
+ }
+ return indexingParameters;
+ }
+
+ private Class<?> getEntityClass(String entity) {
+ Class<?> clazz;
+ try {
+ clazz = ReflectHelper.classForName( entity, ConfigInfo.class );
+ }
+ catch ( ClassNotFoundException e ) {
+ throw new IllegalArgumentException( entity + "not a indexed entity" );
+ }
+ return clazz;
+ }
+}
+
+
Copied: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfoMBean.java (from rev 20091, search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfoMBean.java)
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfoMBean.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/ConfigInfoMBean.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -0,0 +1,90 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.jmx;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Defines the Hibernate Search exposed JMX attributes and operations for index configuration.
+ *
+ * @author Hardy Ferentschik
+ */
+public interface ConfigInfoMBean {
+
+ public static final String CONFIG_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=ConfigInfoMBean";
+
+ /**
+ * Returns the Hibernate Search version.
+ *
+ * @return the Hibernate Search version
+ */
+ String getSearchVersion();
+
+ /**
+ * Returns a list of all indexed classes.
+ *
+ * @return list of all indexed classes
+ */
+ Set<String> getIndexedClassNames();
+
+ /**
+ * Returns the indexing strategy - <i>manual</i> vs. event <i>event</i>.
+ *
+ * @return the indexing strategy
+ */
+ String getIndexingStrategy();
+
+ /**
+ * Returns the number of documents for the given entity.
+ *
+ * @param entity the fqc of the entity
+ *
+ * @return number of documents for the specified entity name
+ *
+ * @throws IllegalArgumentException in case the entity name is not valid
+ */
+ int getNumberOfIndexedEntities(String entity);
+
+ /**
+ * A list of string representations of the indexing parameters for each directory of the specified entity.
+ * Defaults are not displayed, but only parameters which are explicitly set via the configuration.
+ *
+ * @param entity the fqc of the entity
+ *
+ * @return A list of string representations of the indexing parameters for each directory of the specified entity
+ *
+ * @throws IllegalArgumentException in case the entity name is not valid
+ */
+ List<String> getIndexingParameters(String entity);
+
+ /**
+ * Returns a map of all indexed entities and their document count in the index.
+ *
+ * @return a map of all indexed entities and their document count. The map key is the fqc of the entity and
+ * the map value is the document count.
+ */
+ Map<String, Integer> indexedEntitiesCount();
+}
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfo.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfo.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfo.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -1,131 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.jmx;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TopDocs;
-
-import org.hibernate.search.ProjectionConstants;
-import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.reader.ReaderProvider;
-import org.hibernate.search.store.DirectoryProvider;
-import org.hibernate.util.ReflectHelper;
-
-/**
- * Implementation of the {@code HibernateSearchConfigInfoMBean} JMX attributes and operations.
- *
- * @author Hardy Ferentschik
- */
-public class HibernateSearchConfigInfo implements HibernateSearchConfigInfoMBean {
-
- private final SearchFactoryImplementor searchFactoryImplementor;
-
- public HibernateSearchConfigInfo(SearchFactoryImplementor searchFactoryImplementor) {
- this.searchFactoryImplementor = searchFactoryImplementor;
- }
-
- public Set<String> getIndexedClassNames() {
- Set<String> indexedClasses = new HashSet<String>();
- for ( Class clazz : searchFactoryImplementor.getDocumentBuildersIndexedEntities().keySet() ) {
- indexedClasses.add( clazz.getName() );
- }
- return indexedClasses;
- }
-
- public String getIndexingStrategy() {
- return searchFactoryImplementor.getIndexingStrategy();
- }
-
- public int getNumberOfIndexedEntities(String entity) {
- Class<?> clazz = getEntityClass( entity );
- DirectoryProvider[] directoryProviders = searchFactoryImplementor.getDirectoryProviders( clazz );
- ReaderProvider readerProvider = searchFactoryImplementor.getReaderProvider();
-
- int count = 0;
- for ( DirectoryProvider directoryProvider : directoryProviders ) {
- IndexReader reader = readerProvider.openReader( directoryProvider );
- IndexSearcher searcher = new IndexSearcher( reader );
- BooleanQuery boolQuery = new BooleanQuery();
- boolQuery.add( new MatchAllDocsQuery(), BooleanClause.Occur.MUST );
- boolQuery.add(
- new TermQuery( new Term( ProjectionConstants.OBJECT_CLASS, entity ) ), BooleanClause.Occur.MUST
- );
- try {
- TopDocs topdocs = searcher.search( boolQuery, 1 );
- count += topdocs.totalHits;
- }
- catch ( IOException e ) {
- throw new RuntimeException( "Unable to execute count query for entity " + entity, e );
- }
- finally {
- readerProvider.closeReader( reader );
- }
- }
- return count;
- }
-
- public Map<String, Integer> indexedEntitiesCount() {
- Map<String, Integer> countPerEntity = new HashMap<String, Integer>();
- for ( String className : getIndexedClassNames() ) {
- countPerEntity.put( className, getNumberOfIndexedEntities( className ) );
- }
- return countPerEntity;
- }
-
- public List<String> getIndexingParameters(String entity) {
- Class<?> clazz = getEntityClass( entity );
- List<String> indexingParameters = new ArrayList<String>();
- for ( DirectoryProvider directoryProvider : searchFactoryImplementor.getDirectoryProviders( clazz ) ) {
- indexingParameters.add( searchFactoryImplementor.getIndexingParameters( directoryProvider ).toString() );
- }
- return indexingParameters;
- }
-
- private Class<?> getEntityClass(String entity) {
- Class<?> clazz;
- try {
- clazz = ReflectHelper.classForName( entity, HibernateSearchConfigInfo.class );
- }
- catch ( ClassNotFoundException e ) {
- throw new IllegalArgumentException( entity + "not a indexed entity" );
- }
- return clazz;
- }
-}
-
-
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfoMBean.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfoMBean.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchConfigInfoMBean.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -1,83 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.jmx;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Defines the Hibernate Search exposed JMX attributes and operations for index configuration.
- *
- * @author Hardy Ferentschik
- */
-public interface HibernateSearchConfigInfoMBean {
-
- public static final String CONFIG_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=HibernateSearchConfigInfoMBean";
-
- /**
- * Returns a list of all indexed classes.
- *
- * @return list of all indexed classes
- */
- Set<String> getIndexedClassNames();
-
- /**
- * Returns the indexing strategy - <i>manual</i> vs. event <i>event</i>.
- *
- * @return the indexing strategy
- */
- String getIndexingStrategy();
-
- /**
- * Returns the number of documents for the given entity.
- *
- * @param entity the fqc of the entity
- *
- * @return number of documents for the specified entity name
- *
- * @throws IllegalArgumentException in case the entity name is not valid
- */
- int getNumberOfIndexedEntities(String entity);
-
- /**
- * A list of string representations of the indexing parameters for each directory of the specified entity.
- * Defaults are not displayed, but only parameters which are explicitly set via the configuration.
- *
- * @param entity the fqc of the entity
- *
- * @return A list of string representations of the indexing parameters for each directory of the specified entity
- *
- * @throws IllegalArgumentException in case the entity name is not valid
- */
- List<String> getIndexingParameters(String entity);
-
- /**
- * Returns a map of all indexed entities and their document count in the index.
- *
- * @return a map of all indexed entities and their document count. The map key is the fqc of the entity and
- * the map value is the document count.
- */
- Map<String, Integer> indexedEntitiesCount();
-}
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrl.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrl.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -1,115 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.jmx;
-
-import java.util.Properties;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import org.hibernate.CacheMode;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.search.FullTextSession;
-import org.hibernate.search.Search;
-import org.hibernate.search.util.JNDIHelper;
-import org.hibernate.util.ReflectHelper;
-
-
-/**
- * Implementation of the {@code HibernateSearchIndexCtrlMBean} JMX attributes and operations.
- *
- * @author Hardy Ferentschik
- */
-public class HibernateSearchIndexCtrl implements HibernateSearchIndexCtrlMBean {
- private static final String HIBERNATE_JNDI_PREFIX = "hibernate.jndi.";
-
- private final Properties jndiProperties;
- private final String sessionFactoryJndiName;
-
- public HibernateSearchIndexCtrl(Properties props) {
- this.sessionFactoryJndiName = props.getProperty( "hibernate.session_factory_name" );
- this.jndiProperties = JNDIHelper.getJndiProperties( props, HIBERNATE_JNDI_PREFIX );
- }
-
- public void index(String entity) {
- Class<?> clazz = getEntityClass( entity );
-
- SessionFactory factory = getSessionFactory();
- Session session = factory.openSession();
- FullTextSession fulltextSession = Search.getFullTextSession( session );
- try {
- fulltextSession.createIndexer( clazz )
- .batchSizeToLoadObjects( 25 )
- .cacheMode( CacheMode.NORMAL )
- .threadsToLoadObjects( 5 )
- .threadsForSubsequentFetching( 20 )
- .startAndWait();
- }
- catch ( InterruptedException e ) {
- throw new RuntimeException( "Unable to complete indexing" );
- }
- session.close();
- }
-
- public void purge(String entity) {
- Class<?> clazz = getEntityClass( entity );
-
- SessionFactory factory = getSessionFactory();
- Session session = factory.openSession();
- FullTextSession fullTextSession = Search.getFullTextSession( session );
- fullTextSession.beginTransaction();
- fullTextSession.purgeAll( clazz );
- fullTextSession.getTransaction().commit();
- session.close();
- }
-
- private Class<?> getEntityClass(String entity) {
- Class<?> clazz;
- try {
- clazz = ReflectHelper.classForName( entity, HibernateSearchIndexCtrl.class );
- }
- catch ( ClassNotFoundException e ) {
- throw new IllegalArgumentException( entity + "not a indexed entity" );
- }
- return clazz;
- }
-
- private SessionFactory getSessionFactory() {
- try {
- Context initialContext;
- if ( jndiProperties.isEmpty() ) {
- initialContext = new InitialContext();
- }
- else {
- initialContext = new InitialContext( jndiProperties );
- }
- return ( SessionFactory ) initialContext.lookup( sessionFactoryJndiName );
- }
- catch ( Exception e ) {
- throw new UnsupportedOperationException(
- "In order for this operation to work the SessionFactory must be bound to JNDI"
- );
- }
- }
-}
\ No newline at end of file
Deleted: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrlMBean.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrlMBean.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrlMBean.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -1,62 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat, Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.search.jmx;
-
-/**
- * Defines the Hibernate Search exposed JMX attributes and operations for index creation and purging.
- *
- * @author Hardy Ferentschik
- */
-public interface HibernateSearchIndexCtrlMBean {
-
- public static final String INDEX_CTRL_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=HibernateSearchIndexCtrlMBean";
-
- /**
- * Index the specified entity using the mass indexer.
- * <p><b>Note:<br/>
- * This method is only available if the Hibernate {@code SessionFactory}
- * is available via JNDI.
- * </p>
- *
- * @param entity The fqc of the entity to index
- *
- * @throws IllegalArgumentException in case the entity name is not valid
- * @throws UnsupportedOperationException in case the Hibernate {@code SessionFactory} is not bound via JNDI.
- */
- void index(String entity);
-
- /**
- * Purge the index of the specified entity.
- * <p><b>Note:<br/>
- * This method is only available if the Hibernate {@code SessionFactory}
- * is available via JNDI.
- * </p>
- *
- * @param entity The fqc of the entity to index
- *
- * @throws IllegalArgumentException in case the entity name is not valid
- * @throws UnsupportedOperationException in case the Hibernate {@code SessionFactory} is not bound via JNDI.
- */
- void purge(String entity);
-}
\ No newline at end of file
Copied: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexCtrl.java (from rev 20091, search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrl.java)
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexCtrl.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexCtrl.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -0,0 +1,155 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.jmx;
+
+import java.util.Properties;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import org.hibernate.CacheMode;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
+import org.hibernate.search.util.JNDIHelper;
+import org.hibernate.util.ReflectHelper;
+
+
+/**
+ * Implementation of the {@code IndexCtrlMBean} JMX attributes and operations.
+ *
+ * @author Hardy Ferentschik
+ */
+public class IndexCtrl implements IndexCtrlMBean {
+ private static final String HIBERNATE_JNDI_PREFIX = "hibernate.jndi.";
+
+ private final Properties jndiProperties;
+ private final String sessionFactoryJndiName;
+
+ private int batchSize = 25;
+ private int numberOfObjectLoadingThreads = 2;
+ private int numberOfFetchingThreads = 4;
+
+ public IndexCtrl(Properties props) {
+ this.sessionFactoryJndiName = props.getProperty( "hibernate.session_factory_name" );
+ this.jndiProperties = JNDIHelper.getJndiProperties( props, HIBERNATE_JNDI_PREFIX );
+ }
+
+ public void setBatchSize(int batchSize) {
+ this.batchSize = batchSize;
+ }
+
+ public int getBatchSize() {
+ return batchSize;
+ }
+
+ public void setNumberOfObjectLoadingThreads(int numberOfThreads) {
+ this.numberOfObjectLoadingThreads = numberOfThreads;
+ }
+
+ public int getNumberOfObjectLoadingThreads() {
+ return numberOfObjectLoadingThreads;
+ }
+
+ public void setNumberOfFetchingThreads(int numberOfThreads) {
+ this.numberOfFetchingThreads = numberOfThreads;
+ }
+
+ public int getNumberOfFetchingThreads() {
+ return numberOfFetchingThreads;
+ }
+
+ public void index(String entity) {
+ Class<?> clazz = getEntityClass( entity );
+
+ SessionFactory factory = getSessionFactory();
+ Session session = factory.openSession();
+ FullTextSession fulltextSession = Search.getFullTextSession( session );
+ try {
+ fulltextSession.createIndexer( clazz )
+ .batchSizeToLoadObjects( batchSize )
+ .cacheMode( CacheMode.NORMAL )
+ .threadsToLoadObjects( numberOfObjectLoadingThreads )
+ .threadsForSubsequentFetching( numberOfFetchingThreads )
+ .startAndWait();
+ }
+ catch ( InterruptedException e ) {
+ throw new RuntimeException( "Unable to complete indexing" );
+ }
+ session.close();
+ }
+
+ public void optimize(String entity) {
+ Class<?> clazz = getEntityClass( entity );
+
+ SessionFactory factory = getSessionFactory();
+ Session session = factory.openSession();
+ FullTextSession fullTextSession = Search.getFullTextSession( session );
+ fullTextSession.beginTransaction();
+ fullTextSession.getSearchFactory().optimize( clazz );
+ fullTextSession.getTransaction().commit();
+ session.close();
+ }
+
+ public void purge(String entity) {
+ Class<?> clazz = getEntityClass( entity );
+
+ SessionFactory factory = getSessionFactory();
+ Session session = factory.openSession();
+ FullTextSession fullTextSession = Search.getFullTextSession( session );
+ fullTextSession.beginTransaction();
+ fullTextSession.purgeAll( clazz );
+ fullTextSession.getTransaction().commit();
+ session.close();
+ }
+
+ private Class<?> getEntityClass(String entity) {
+ Class<?> clazz;
+ try {
+ clazz = ReflectHelper.classForName( entity, IndexCtrl.class );
+ }
+ catch ( ClassNotFoundException e ) {
+ throw new IllegalArgumentException( entity + "not a indexed entity" );
+ }
+ return clazz;
+ }
+
+ private SessionFactory getSessionFactory() {
+ try {
+ Context initialContext;
+ if ( jndiProperties.isEmpty() ) {
+ initialContext = new InitialContext();
+ }
+ else {
+ initialContext = new InitialContext( jndiProperties );
+ }
+ return ( SessionFactory ) initialContext.lookup( sessionFactoryJndiName );
+ }
+ catch ( Exception e ) {
+ throw new UnsupportedOperationException(
+ "In order for this operation to work the SessionFactory must be bound to JNDI"
+ );
+ }
+ }
+}
\ No newline at end of file
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexCtrlMBean.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexCtrlMBean.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexCtrlMBean.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -0,0 +1,108 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.jmx;
+
+/**
+ * Defines the Hibernate Search exposed JMX attributes and operations for index creation and purging.
+ *
+ * @author Hardy Ferentschik
+ */
+public interface IndexCtrlMBean {
+
+ public static final String INDEX_CTRL_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=IndexCtrlMBean";
+
+ /**
+ * Sets the batch size for the mass indexer.
+ *
+ * @param batchSize the new batch size
+ */
+ void setBatchSize(int batchSize);
+
+ /**
+ * @return the current batch size for (mass) indexing
+ */
+ int getBatchSize();
+
+ /**
+ * @param numberOfThreads the number of threads used for object loading during mass indexing.
+ */
+ void setNumberOfObjectLoadingThreads(int numberOfThreads);
+
+ /**
+ * @return the current number of threads during mass indexing
+ */
+ int getNumberOfObjectLoadingThreads();
+
+ /**
+ * @param numberOfThreads the number of threads used for collections fetching during mass indexing
+ */
+ void setNumberOfFetchingThreads(int numberOfThreads);
+
+ /**
+ * @return the current number of threads used for collection fetching
+ */
+ int getNumberOfFetchingThreads();
+
+ /**
+ * Index the specified entity using the mass indexer.
+ * <p><b>Note:<br/>
+ * This method is only available if the Hibernate {@code SessionFactory}
+ * is available via JNDI.
+ * </p>
+ *
+ * @param entity The fqc of the entity to index
+ *
+ * @throws IllegalArgumentException in case the entity name is not valid
+ * @throws UnsupportedOperationException in case the Hibernate {@code SessionFactory} is not bound via JNDI.
+ */
+ void index(String entity);
+
+ /**
+ * Optimizes the index for the specified entity.
+ * <p><b>Note:<br/>
+ * This method is only available if the Hibernate {@code SessionFactory}
+ * is available via JNDI.
+ * </p>
+ *
+ * @param entity The fqc of the entity to index
+ *
+ * @throws IllegalArgumentException in case the entity name is not valid
+ * @throws UnsupportedOperationException in case the Hibernate {@code SessionFactory} is not bound via JNDI.
+ */
+ void optimize(String entity);
+
+ /**
+ * Purge the index of the specified entity.
+ * <p><b>Note:<br/>
+ * This method is only available if the Hibernate {@code SessionFactory}
+ * is available via JNDI.
+ * </p>
+ *
+ * @param entity The fqc of the entity to index
+ *
+ * @throws IllegalArgumentException in case the entity name is not valid
+ * @throws UnsupportedOperationException in case the Hibernate {@code SessionFactory} is not bound via JNDI.
+ */
+ void purge(String entity);
+}
\ No newline at end of file
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitor.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitor.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -0,0 +1,69 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.jmx;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class IndexingProgressMonitor implements IndexingProgressMonitorMBean, MassIndexerProgressMonitor {
+
+ private final AtomicLong documentsDoneCounter = new AtomicLong();
+ private final AtomicLong documentsBuiltCounter = new AtomicLong();
+ private final AtomicLong totalCounter = new AtomicLong();
+ private final AtomicLong entitiesLoadedCounter = new AtomicLong();
+
+ public void documentsAdded(long increment) {
+ documentsDoneCounter.addAndGet( increment );
+ }
+
+ public void documentsBuilt(int number) {
+ documentsBuiltCounter.addAndGet( number );
+ }
+
+ public void entitiesLoaded(int size) {
+ entitiesLoadedCounter.addAndGet( size );
+ }
+
+ public void addToTotalCount(long count) {
+ totalCounter.addAndGet( count );
+ }
+
+ public long getLoadedEntitiesCount() {
+ return entitiesLoadedCounter.get();
+ }
+
+ public long getDocumentsAddedCount() {
+ return documentsDoneCounter.get();
+ }
+
+ public long getNumberOfEntitiesToIndex() {
+ return totalCounter.get();
+ }
+}
+
+
Copied: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitorMBean.java (from rev 20091, search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/HibernateSearchIndexCtrlMBean.java)
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitorMBean.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexingProgressMonitorMBean.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -0,0 +1,51 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.jmx;
+
+/**
+ * A MBean for following the progress of mass indexing.
+ *
+ * @author Hardy Ferentschik
+ */
+public interface IndexingProgressMonitorMBean {
+
+ public static final String INDEXING_PROGRESS_MONITOR_MBEAN_OBJECT_NAME = "org.hibernate.search.jmx:type=IndexingProgressMBean";
+
+ /**
+ * @return the number of entities loaded so far
+ */
+ long getLoadedEntitiesCount();
+
+ /**
+ * @return the number of Lucene {@code Document}s added so far
+ */
+ long getDocumentsAddedCount();
+
+ /**
+ * @return the total number of entities which need indexing
+ */
+ long getNumberOfEntitiesToIndex();
+}
+
+
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/JMXRegistrar.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/JMXRegistrar.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/jmx/JMXRegistrar.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -0,0 +1,85 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.search.jmx;
+
+import java.lang.management.ManagementFactory;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.slf4j.Logger;
+
+import org.hibernate.search.SearchException;
+import org.hibernate.search.util.LoggerFactory;
+
+/**
+ * Helper class to register JMX beans.
+ *
+ * @author Hardy Ferentschik
+ */
+public final class JMXRegistrar {
+ private static final Logger log = LoggerFactory.make();
+
+ private JMXRegistrar() {
+ }
+
+ /**
+ * Registers the specified object with the given name to the MBean server.
+ *
+ * @param object the object to register
+ * @param name the object name to register the bean under
+ */
+ public static void registerMBean(Object object, String name) {
+ ObjectName objectName = createObjectName( name );
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ if ( mbs.isRegistered( objectName ) ) {
+ try {
+ mbs.unregisterMBean( objectName );
+ }
+ catch ( Exception e ) {
+ log.warn( "Unable to un-register existing MBean: " + name, e );
+ }
+ }
+
+ try {
+ mbs.registerMBean( object, objectName );
+ }
+ catch ( Exception e ) {
+ throw new SearchException( "Unable to enable MBean for Hibernate Search", e );
+ }
+ }
+
+ private static ObjectName createObjectName(String name) {
+ ObjectName objectName;
+ try {
+ objectName = new ObjectName( name );
+ }
+ catch ( MalformedObjectNameException e ) {
+ throw new SearchException( "Invalid JMX Bean name: " + name, e );
+ }
+ return objectName;
+ }
+}
+
+
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/batchindexing/IndexingGeneratedCorpusTest.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -27,10 +27,11 @@
import java.util.List;
import junit.framework.TestCase;
-
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
+
import org.hibernate.Transaction;
+import org.hibernate.search.Environment;
import org.hibernate.search.FullTextQuery;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.backend.impl.batchlucene.LuceneBatchBackend;
@@ -40,15 +41,15 @@
/**
* Tests the fullTextSession.createIndexer() API
* for basic functionality.
- *
+ *
* @author Sanne Grinovero
*/
public class IndexingGeneratedCorpusTest extends TestCase {
-
+
private final int BOOK_NUM = 140;
private final int ANCIENTBOOK_NUM = 120;
- private final int DVD_NUM = 200;
-
+ private final int DVD_NUM = 10000;
+
private SentenceInventor sentenceInventor = new SentenceInventor( 7L, 4000 );
private FullTextSessionBuilder builder;
private int totalEntitiesInDB = 0;
@@ -58,36 +59,42 @@
super.setUp();
builder = new FullTextSessionBuilder();
builder
- .addAnnotatedClass( Book.class )
- .addAnnotatedClass( Dvd.class )
- .addAnnotatedClass( AncientBook.class )
- .addAnnotatedClass( Nation.class )
- .setProperty( "hibernate.show_sql", "false" ) //too verbose for this test
- .setProperty( LuceneBatchBackend.CONCURRENT_WRITERS, "4" )
- .build();
+ .addAnnotatedClass( Book.class )
+ .addAnnotatedClass( Dvd.class )
+ .addAnnotatedClass( AncientBook.class )
+ .addAnnotatedClass( Nation.class )
+ .setProperty( "hibernate.show_sql", "false" ) //too verbose for this test
+ .setProperty( LuceneBatchBackend.CONCURRENT_WRITERS, "4" )
+ .setProperty( "hibernate.session_factory_name", "java:comp/SessionFactory" )
+ .setProperty( "hibernate.jndi.class", "org.osjava.sj.SimpleContextFactory" )
+ .setProperty( "hibernate.jndi.org.osjava.sj.root", "/Users/hardy/tmp/jndi-entries" )
+ .setProperty( "hibernate.jndi.org.osjava.sj.jndi.shared", "true" )
+ .setProperty( Environment.JMX_ENABLED, "true" )
+ .build();
createMany( Book.class, BOOK_NUM );
createMany( Dvd.class, DVD_NUM );
createMany( AncientBook.class, ANCIENTBOOK_NUM );
storeAllBooksInNation();
}
-
+
@Override
protected void tearDown() {
builder.close();
}
- private void createMany(Class<? extends TitleAble> entityType, int amount ) throws InstantiationException, IllegalAccessException {
+ private void createMany(Class<? extends TitleAble> entityType, int amount)
+ throws InstantiationException, IllegalAccessException {
FullTextSession fullTextSession = builder.openFullTextSession();
try {
Transaction tx = fullTextSession.beginTransaction();
- fullTextSession.persist( new Nation("Italy", "IT") );
+ fullTextSession.persist( new Nation( "Italy", "IT" ) );
tx.commit();
tx = fullTextSession.beginTransaction();
for ( int i = 0; i < amount; i++ ) {
TitleAble instance = entityType.newInstance();
instance.setTitle( sentenceInventor.nextSentence() );
//to test for HSEARCH-512 we make all entities share some proxy
- Nation country = (Nation) fullTextSession.load( Nation.class, 1 );
+ Nation country = ( Nation ) fullTextSession.load( Nation.class, 1 );
instance.setFirstPublishedIn( country );
fullTextSession.persist( instance );
totalEntitiesInDB++;
@@ -95,7 +102,7 @@
tx.commit();
fullTextSession.clear();
System.out.println( "Test preparation: " + totalEntitiesInDB + " entities persisted" );
- tx = fullTextSession.beginTransaction();
+ tx = fullTextSession.beginTransaction();
}
}
tx.commit();
@@ -104,7 +111,7 @@
fullTextSession.close();
}
}
-
+
/**
* Adds all stored books to the Nation.
* Needed to test for HSEARCH-534 and makes the dataset to index quite bigger.
@@ -114,7 +121,7 @@
try {
Transaction tx = fullTextSession.beginTransaction();
List<Book> allBooks = fullTextSession.createCriteria( Book.class ).list();
- Nation italy = (Nation) fullTextSession.load( Nation.class, 1 );
+ Nation italy = ( Nation ) fullTextSession.load( Nation.class, 1 );
italy.getLibrariesHave().addAll( allBooks );
tx.commit();
}
@@ -122,26 +129,29 @@
fullTextSession.close();
}
}
-
+
public void testBatchIndexing() throws InterruptedException {
verifyResultNumbers(); //initial count of entities should match expectations
purgeAll(); // empty indexes
verifyIsEmpty();
reindexAll(); // rebuild the indexes
+
+ Thread.sleep( 60000 );
+
verifyResultNumbers(); // verify the count match again
reindexAll(); //tests that purgeAll is automatic:
verifyResultNumbers(); //..same numbers again
}
-
+
private void reindexAll() throws InterruptedException {
FullTextSession fullTextSession = builder.openFullTextSession();
try {
fullTextSession.createIndexer( Object.class )
- .threadsForSubsequentFetching( 8 )
- .threadsToLoadObjects( 4 )
- .batchSizeToLoadObjects( 30 )
- .startAndWait();
- }
+ .threadsForSubsequentFetching( 8 )
+ .threadsToLoadObjects( 4 )
+ .batchSizeToLoadObjects( 30 )
+ .startAndWait();
+ }
finally {
fullTextSession.close();
}
@@ -161,18 +171,28 @@
@SuppressWarnings("unchecked")
private void verifyResultNumbers() {
- assertEquals( DVD_NUM,
- countByFT( Dvd.class ) );
- assertEquals( ANCIENTBOOK_NUM + BOOK_NUM,
- countByFT( Book.class ) );
- assertEquals( ANCIENTBOOK_NUM,
- countByFT( AncientBook.class ) );
- assertEquals( DVD_NUM + ANCIENTBOOK_NUM + BOOK_NUM,
- countByFT( AncientBook.class, Book.class, Dvd.class ) );
- assertEquals( DVD_NUM + ANCIENTBOOK_NUM,
- countByFT( AncientBook.class, Dvd.class ) );
+ assertEquals(
+ DVD_NUM,
+ countByFT( Dvd.class )
+ );
+ assertEquals(
+ ANCIENTBOOK_NUM + BOOK_NUM,
+ countByFT( Book.class )
+ );
+ assertEquals(
+ ANCIENTBOOK_NUM,
+ countByFT( AncientBook.class )
+ );
+ assertEquals(
+ DVD_NUM + ANCIENTBOOK_NUM + BOOK_NUM,
+ countByFT( AncientBook.class, Book.class, Dvd.class )
+ );
+ assertEquals(
+ DVD_NUM + ANCIENTBOOK_NUM,
+ countByFT( AncientBook.class, Dvd.class )
+ );
}
-
+
@SuppressWarnings("unchecked")
private void verifyIsEmpty() {
assertEquals( 0, countByFT( Dvd.class ) );
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -40,7 +40,7 @@
import org.hibernate.search.Environment;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
-import org.hibernate.search.jmx.HibernateSearchConfigInfoMBean;
+import org.hibernate.search.jmx.ConfigInfoMBean;
import org.hibernate.search.test.SearchTestCase;
/**
@@ -123,7 +123,7 @@
protected void setUp() throws Exception {
super.setUp();
mbeanServer = ManagementFactory.getPlatformMBeanServer();
- configBeanObjectName = new ObjectName( HibernateSearchConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
+ configBeanObjectName = new ObjectName( ConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
}
protected void tearDown() throws Exception {
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -41,8 +41,8 @@
import org.hibernate.search.Environment;
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
-import org.hibernate.search.jmx.HibernateSearchConfigInfoMBean;
-import org.hibernate.search.jmx.HibernateSearchIndexCtrlMBean;
+import org.hibernate.search.jmx.ConfigInfoMBean;
+import org.hibernate.search.jmx.IndexCtrlMBean;
import org.hibernate.search.test.SearchTestCase;
/**
@@ -111,8 +111,8 @@
protected void setUp() throws Exception {
super.setUp();
mbeanServer = ManagementFactory.getPlatformMBeanServer();
- configBeanObjectName = new ObjectName( HibernateSearchConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
- indexBeanObjectName = new ObjectName( HibernateSearchIndexCtrlMBean.INDEX_CTRL_MBEAN_OBJECT_NAME );
+ configBeanObjectName = new ObjectName( ConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
+ indexBeanObjectName = new ObjectName( IndexCtrlMBean.INDEX_CTRL_MBEAN_OBJECT_NAME );
}
protected void tearDown() throws Exception {
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/NoMBeansEnabledTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/NoMBeansEnabledTest.java 2010-08-18 18:55:48 UTC (rev 20173)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/NoMBeansEnabledTest.java 2010-08-19 11:43:20 UTC (rev 20174)
@@ -30,8 +30,8 @@
import org.hibernate.cfg.Configuration;
import org.hibernate.search.Environment;
-import org.hibernate.search.jmx.HibernateSearchConfigInfoMBean;
-import org.hibernate.search.jmx.HibernateSearchIndexCtrlMBean;
+import org.hibernate.search.jmx.ConfigInfoMBean;
+import org.hibernate.search.jmx.IndexCtrlMBean;
import org.hibernate.search.test.SearchTestCase;
/**
@@ -42,13 +42,13 @@
public void testMBeanNotRegisteredWithoutExplicitProperty() throws Exception {
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- ObjectName name = new ObjectName( HibernateSearchConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
+ ObjectName name = new ObjectName( ConfigInfoMBean.CONFIG_MBEAN_OBJECT_NAME );
assertFalse(
"Without '" + Environment.JMX_ENABLED + "' set the configuration info MBean should not be registered",
mbs.isRegistered( name )
);
- name = new ObjectName( HibernateSearchIndexCtrlMBean.INDEX_CTRL_MBEAN_OBJECT_NAME );
+ name = new ObjectName( IndexCtrlMBean.INDEX_CTRL_MBEAN_OBJECT_NAME );
assertFalse(
"Without '" + Environment.JMX_ENABLED + "' set the index control MBean should not be registered",
mbs.isRegistered( name )
15 years, 4 months
- 1
- 0
Hibernate SVN: r20173 - in core/branches/Branch_3_5: annotations and 31 other directories.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2010-08-18 14:55:48 -0400 (Wed, 18 Aug 2010)
New Revision: 20173
Modified:
core/branches/Branch_3_5/annotations/pom.xml
core/branches/Branch_3_5/cache-ehcache/pom.xml
core/branches/Branch_3_5/cache-infinispan/pom.xml
core/branches/Branch_3_5/cache-jbosscache/pom.xml
core/branches/Branch_3_5/cache-oscache/pom.xml
core/branches/Branch_3_5/cache-swarmcache/pom.xml
core/branches/Branch_3_5/connection-c3p0/pom.xml
core/branches/Branch_3_5/connection-proxool/pom.xml
core/branches/Branch_3_5/core/pom.xml
core/branches/Branch_3_5/distribution/pom.xml
core/branches/Branch_3_5/documentation/envers/pom.xml
core/branches/Branch_3_5/documentation/jbosscache2/pom.xml
core/branches/Branch_3_5/documentation/manual/old/es-ES/pom.xml
core/branches/Branch_3_5/documentation/manual/old/fr-FR/pom.xml
core/branches/Branch_3_5/documentation/manual/old/ja-JP/pom.xml
core/branches/Branch_3_5/documentation/manual/old/ko-KR/pom.xml
core/branches/Branch_3_5/documentation/manual/old/pt-BR/pom.xml
core/branches/Branch_3_5/documentation/manual/old/zh-CN/pom.xml
core/branches/Branch_3_5/documentation/manual/pom.xml
core/branches/Branch_3_5/documentation/pom.xml
core/branches/Branch_3_5/entitymanager/pom.xml
core/branches/Branch_3_5/envers/pom.xml
core/branches/Branch_3_5/hibernate-maven-plugin/pom.xml
core/branches/Branch_3_5/jdbc3-testing/pom.xml
core/branches/Branch_3_5/jdbc4-testing/pom.xml
core/branches/Branch_3_5/jmx/pom.xml
core/branches/Branch_3_5/parent/pom.xml
core/branches/Branch_3_5/pom.xml
core/branches/Branch_3_5/testing/pom.xml
core/branches/Branch_3_5/testsuite/pom.xml
core/branches/Branch_3_5/tutorials/eg/pom.xml
core/branches/Branch_3_5/tutorials/pom.xml
core/branches/Branch_3_5/tutorials/web/pom.xml
Log:
Changed 3.5.5-Final to 3.5.6-SNAPSHOT
Modified: core/branches/Branch_3_5/annotations/pom.xml
===================================================================
--- core/branches/Branch_3_5/annotations/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/annotations/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/cache-ehcache/pom.xml
===================================================================
--- core/branches/Branch_3_5/cache-ehcache/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/cache-ehcache/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/cache-infinispan/pom.xml
===================================================================
--- core/branches/Branch_3_5/cache-infinispan/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/cache-infinispan/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/cache-jbosscache/pom.xml
===================================================================
--- core/branches/Branch_3_5/cache-jbosscache/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/cache-jbosscache/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/cache-oscache/pom.xml
===================================================================
--- core/branches/Branch_3_5/cache-oscache/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/cache-oscache/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/cache-swarmcache/pom.xml
===================================================================
--- core/branches/Branch_3_5/cache-swarmcache/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/cache-swarmcache/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/connection-c3p0/pom.xml
===================================================================
--- core/branches/Branch_3_5/connection-c3p0/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/connection-c3p0/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/connection-proxool/pom.xml
===================================================================
--- core/branches/Branch_3_5/connection-proxool/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/connection-proxool/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/core/pom.xml
===================================================================
--- core/branches/Branch_3_5/core/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/core/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/distribution/pom.xml
===================================================================
--- core/branches/Branch_3_5/distribution/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/distribution/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/documentation/envers/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/envers/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/envers/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/documentation/jbosscache2/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/jbosscache2/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/jbosscache2/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/documentation/manual/old/es-ES/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/manual/old/es-ES/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/manual/old/es-ES/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/branches/Branch_3_5/documentation/manual/old/fr-FR/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/manual/old/fr-FR/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/manual/old/fr-FR/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/branches/Branch_3_5/documentation/manual/old/ja-JP/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/manual/old/ja-JP/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/manual/old/ja-JP/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/branches/Branch_3_5/documentation/manual/old/ko-KR/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/manual/old/ko-KR/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/manual/old/ko-KR/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/branches/Branch_3_5/documentation/manual/old/pt-BR/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/manual/old/pt-BR/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/manual/old/pt-BR/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/branches/Branch_3_5/documentation/manual/old/zh-CN/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/manual/old/zh-CN/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/manual/old/zh-CN/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/branches/Branch_3_5/documentation/manual/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/manual/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/manual/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/documentation/pom.xml
===================================================================
--- core/branches/Branch_3_5/documentation/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/documentation/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/entitymanager/pom.xml
===================================================================
--- core/branches/Branch_3_5/entitymanager/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/entitymanager/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/envers/pom.xml
===================================================================
--- core/branches/Branch_3_5/envers/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/envers/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/hibernate-maven-plugin/pom.xml
===================================================================
--- core/branches/Branch_3_5/hibernate-maven-plugin/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/hibernate-maven-plugin/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -27,7 +27,7 @@
<parent>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/jdbc3-testing/pom.xml
===================================================================
--- core/branches/Branch_3_5/jdbc3-testing/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/jdbc3-testing/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/jdbc4-testing/pom.xml
===================================================================
--- core/branches/Branch_3_5/jdbc4-testing/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/jdbc4-testing/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/jmx/pom.xml
===================================================================
--- core/branches/Branch_3_5/jmx/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/jmx/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/parent/pom.xml
===================================================================
--- core/branches/Branch_3_5/parent/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/parent/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
Modified: core/branches/Branch_3_5/pom.xml
===================================================================
--- core/branches/Branch_3_5/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/testing/pom.xml
===================================================================
--- core/branches/Branch_3_5/testing/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/testing/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/testsuite/pom.xml
===================================================================
--- core/branches/Branch_3_5/testsuite/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/testsuite/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/tutorials/eg/pom.xml
===================================================================
--- core/branches/Branch_3_5/tutorials/eg/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/tutorials/eg/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/tutorials/pom.xml
===================================================================
--- core/branches/Branch_3_5/tutorials/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/tutorials/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/branches/Branch_3_5/tutorials/web/pom.xml
===================================================================
--- core/branches/Branch_3_5/tutorials/web/pom.xml 2010-08-18 18:50:53 UTC (rev 20172)
+++ core/branches/Branch_3_5/tutorials/web/pom.xml 2010-08-18 18:55:48 UTC (rev 20173)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.5-Final</version>
+ <version>3.5.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
15 years, 4 months
- 1
- 0
Hibernate SVN: r20172 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2010-08-18 14:50:53 -0400 (Wed, 18 Aug 2010)
New Revision: 20172
Added:
core/tags/hibernate-3.5.5-Final/
Log:
Create hibernate-3.5.5-Final tag
Copied: core/tags/hibernate-3.5.5-Final (from rev 20171, core/branches/Branch_3_5)
15 years, 4 months
- 1
- 0
Hibernate SVN: r20171 - in core/trunk: cache-ehcache and 26 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-08-18 14:47:29 -0400 (Wed, 18 Aug 2010)
New Revision: 20171
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-infinispan/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/distribution/pom.xml
core/trunk/documentation/devguide/pom.xml
core/trunk/documentation/envers/pom.xml
core/trunk/documentation/jbosscache2/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/pom.xml
core/trunk/documentation/quickstart/pom.xml
core/trunk/documentation/quickstart/src/main/docbook/en-US/content/extras/examples/annotations/pom.xml
core/trunk/documentation/quickstart/src/main/docbook/en-US/content/extras/examples/hbm/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/envers/pom.xml
core/trunk/jdbc3-testing/pom.xml
core/trunk/jdbc4-testing/pom.xml
core/trunk/parent/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
core/trunk/tutorials/eg/pom.xml
core/trunk/tutorials/pom.xml
core/trunk/tutorials/web/pom.xml
Log:
Updating pom versions to 3.6.0-SNAPSHOT for release tagging
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/cache-ehcache/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/cache-infinispan/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/cache-jbosscache/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/cache-oscache/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/cache-swarmcache/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/connection-c3p0/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/connection-proxool/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/core/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/distribution/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/devguide/pom.xml
===================================================================
--- core/trunk/documentation/devguide/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/documentation/devguide/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/documentation/envers/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/documentation/jbosscache2/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/documentation/manual/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/documentation/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/documentation/quickstart/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/src/main/docbook/en-US/content/extras/examples/annotations/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/src/main/docbook/en-US/content/extras/examples/annotations/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/documentation/quickstart/src/main/docbook/en-US/content/extras/examples/annotations/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -5,7 +5,7 @@
<groupId>org.hibernate.tutorials</groupId>
<artifactId>hibernate-tutorial-annotations</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<name>Hibernate Annotations Tutorial</name>
<dependencies>
Modified: core/trunk/documentation/quickstart/src/main/docbook/en-US/content/extras/examples/hbm/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/src/main/docbook/en-US/content/extras/examples/hbm/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/documentation/quickstart/src/main/docbook/en-US/content/extras/examples/hbm/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -5,7 +5,7 @@
<groupId>org.hibernate.tutorials</groupId>
<artifactId>hibernate-tutorial-hbm</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<name>Hibernate hbm.xml Tutorial</name>
<dependencies>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/entitymanager/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/envers/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/jdbc3-testing/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/jdbc4-testing/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/parent/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/testing/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/testsuite/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/tutorials/eg/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/tutorials/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2010-08-18 18:47:10 UTC (rev 20170)
+++ core/trunk/tutorials/web/pom.xml 2010-08-18 18:47:29 UTC (rev 20171)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0.Beta3</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
15 years, 4 months
- 1
- 0