HSEARCH-926 and a test that verifies multiple types sharing the same index still only result in one InfinispanDirectoryProvider getting created for the index.

Author: zackurey

hibernate-search-infinispan/src/test/java/org/hibernate/search/infinispan/ClusterTestHelper.java

@@ -20,6 +20,7 @@
 package org.hibernate.search.infinispan;
 
 import java.util.List;
+import java.util.Set;
 
 import junit.framework.AssertionFailedError;
 
@@ -50,7 +51,7 @@ public class ClusterTestHelper {
  * join the existing nodes.
  * @return a started FullTextSessionBuilder
  */
-public static FullTextSessionBuilder createClusterNode() {
+public static FullTextSessionBuilder createClusterNode(Set<Class<?>> entityTypes) {
 FullTextSessionBuilder node = new FullTextSessionBuilder()
 .setProperty( "hibernate.search.default.directory_provider", "infinispan" )
 // fragment on every 7 bytes: don't use this on a real case!
@@ -65,15 +66,17 @@ public static FullTextSessionBuilder createClusterNode() {
 .setProperty(
 Environment.CONNECTION_PROVIDER,
 org.hibernate.search.infinispan.ClusterSharedConnectionProvider.class.getName()
-)
-.addAnnotatedClass( SimpleEmail.class );
+);
+for(Class<?> entityType : entityTypes){
+node.addAnnotatedClass( entityType );
+}
 return node.build();
 }
 
 /**
  * Wait some time for the cluster to form
  */
-public static void waitMembersCount(FullTextSessionBuilder node, int expectedSize) {
+public static void waitMembersCount(FullTextSessionBuilder node, Class<?> entityType, int expectedSize) {
 int currentSize = 0;
 int loopCounter = 0;
 while ( currentSize < expectedSize ) {
@@ -83,7 +86,7 @@ public static void waitMembersCount(FullTextSessionBuilder node, int expectedSiz
 catch ( InterruptedException e ) {
 throw new AssertionFailedError( e.getMessage() );
 }
-currentSize = clusterSize( node );
+currentSize = clusterSize( node, entityType);
 if ( loopCounter > 200 ) {
 throw new AssertionFailedError( "timeout while waiting for all nodes to join in cluster" );
 }
@@ -95,10 +98,10 @@ public static void waitMembersCount(FullTextSessionBuilder node, int expectedSiz
  * @param node the FullTextSessionBuilder representing the current node
  * @return the number of nodes as seen by the current node
  */
-public static int clusterSize(FullTextSessionBuilder node) {
+public static int clusterSize(FullTextSessionBuilder node, Class<?> entityType) {
 SearchFactoryIntegrator searchFactory = (SearchFactoryIntegrator) node.getSearchFactory();
-EntityIndexBinder<SimpleEmail> mailIndexBinding = searchFactory.getIndexBindingForEntity( SimpleEmail.class );
-DirectoryBasedIndexManager indexManager = (DirectoryBasedIndexManager) mailIndexBinding.getIndexManagers()[0];
+EntityIndexBinder<?> indexBinding = searchFactory.getIndexBindingForEntity( entityType );
+DirectoryBasedIndexManager indexManager = (DirectoryBasedIndexManager) indexBinding.getIndexManagers()[0];
 InfinispanDirectoryProvider directoryProvider = (InfinispanDirectoryProvider) indexManager.getDirectoryProvider();
 EmbeddedCacheManager cacheManager = directoryProvider.getCacheManager();
 List<Address> members = cacheManager.getMembers();

hibernate-search-infinispan/src/test/java/org/hibernate/search/infinispan/LiveRunningTest.java

@@ -24,6 +24,7 @@
 import static org.hibernate.search.infinispan.ClusterTestHelper.createClusterNode;
 import static org.hibernate.search.infinispan.ClusterTestHelper.waitMembersCount;
 
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -52,8 +53,9 @@ public class LiveRunningTest {
 
 private static final int TEST_RUNS = 17;
 private static final int MAX_SLAVES = 5;
+private static HashSet<Class<?>> entityTypes;
 
-private final FullTextSessionBuilder master = createClusterNode();
+private final FullTextSessionBuilder master = createClusterNode(entityTypes);
 private final List<FullTextSessionBuilder> slaves = new LinkedList<FullTextSessionBuilder>();
 
 private boolean growCluster = true;
@@ -85,7 +87,7 @@ private void assertViews() {
 }
 
 private void assertView(FullTextSessionBuilder node) {
-assertEquals( slaves.size() + 1 , clusterSize( node ) );
+assertEquals( slaves.size() + 1 , clusterSize( node, SimpleEmail.class ) );
 FullTextSession session = node.openFullTextSession();
 try {
 FullTextQuery fullTextQuery = session.createFullTextQuery( new MatchAllDocsQuery() );
@@ -103,7 +105,7 @@ private void adjustSlavesNumber(int i) {
 growCluster = false;
 }
 else {
-slaves.add( createClusterNode() );
+slaves.add( createClusterNode(entityTypes) );
 }
 }
 else {
@@ -136,14 +138,16 @@ private void writeOnMaster() {
 
 private void waitForAllJoinsCompleted() {
 int expectedSize = slaves.size() + 1;
-waitMembersCount( master, expectedSize );
+waitMembersCount( master, SimpleEmail.class, expectedSize );
 for (FullTextSessionBuilder slave : slaves) {
-waitMembersCount( slave, expectedSize );
+waitMembersCount( slave, SimpleEmail.class, expectedSize );
 }
 }
 
 @BeforeClass
 public static void prepareConnectionPool() {
+entityTypes = new HashSet<Class<?>>();
+entityTypes.add( SimpleEmail.class );
 ClusterSharedConnectionProvider.realStart();
 }
 

hibernate-search-infinispan/src/test/java/org/hibernate/search/infinispan/TwoNodesTest.java

@@ -28,6 +28,7 @@
 import static org.hibernate.search.infinispan.ClusterTestHelper.createClusterNode;
 import static org.hibernate.search.infinispan.ClusterTestHelper.waitMembersCount;
 
+import java.util.HashSet;
 import java.util.List;
 
 import org.apache.lucene.search.Query;
@@ -59,10 +60,11 @@ public class TwoNodesTest {
 
 FullTextSessionBuilder nodea;
 FullTextSessionBuilder nodeb;
+HashSet<Class<?>> entityTypes;
 
 @Test
 public void testSomething() {
-assertEquals( 2, clusterSize( nodea ) );
+assertEquals( 2, clusterSize( nodea, SimpleEmail.class  ) );
 // index an entity:
 {
 FullTextSession fullTextSession = nodea.openFullTextSession();
@@ -77,16 +79,16 @@ public void testSomething() {
 // verify nodeb is able to find it:
 verifyNodeSeesUpdatedIndex( nodeb );
 // now start a new node, it will join the cluster and receive the current index state:
-FullTextSessionBuilder nodeC = createClusterNode();
-assertEquals( 3, clusterSize( nodea ) );
+FullTextSessionBuilder nodeC = createClusterNode(entityTypes);
+assertEquals( 3, clusterSize( nodea, SimpleEmail.class ) );
 try {
 // verify the new node is able to perform the same searches:
 verifyNodeSeesUpdatedIndex(nodeC);
 }
 finally {
 nodeC.close();
 }
-assertEquals( 2, clusterSize( nodea ) );
+assertEquals( 2, clusterSize( nodea, SimpleEmail.class  ) );
 verifyNodeSeesUpdatedIndex( nodea );
 verifyNodeSeesUpdatedIndex( nodeb );
 }
@@ -116,9 +118,11 @@ private void verifyNodeSeesUpdatedIndex(FullTextSessionBuilder node) {
 
 @Before
 public void setUp() throws Exception {
-nodea = createClusterNode();
-nodeb = createClusterNode();
-waitMembersCount( nodea, 2 );
+entityTypes = new HashSet<Class<?>>();
+entityTypes.add( SimpleEmail.class );
+nodea = createClusterNode(entityTypes);
+nodeb = createClusterNode(entityTypes);
+waitMembersCount( nodea, SimpleEmail.class, 2 );
 }
 
 @After

hibernate-search-infinispan/src/test/java/org/hibernate/search/infinispan/sharedIndex/Device.java

@@ -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.infinispan.sharedIndex;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+
+@Entity
+public abstract class Device {
+
+public Device(String manufacturer, String model, String serialNumber) {
+this.manufacturer = manufacturer;
+this.model = model;
+this.serialNumber = serialNumber;
+}
+
+@Id
+@GeneratedValue
+public Long id;
+
+@Field(analyze=Analyze.NO)
+@Column(name = "mfg")
+public String manufacturer = "";
+
+@Field(analyze=Analyze.NO)
+@Column(name = "model")
+public String model = "";
+
+@Field(analyze=Analyze.NO)
+@Column(name = "serial_number")
+public String serialNumber;
+
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + ( ( manufacturer == null ) ? 0 : manufacturer.hashCode() );
+result = prime * result + ( ( model == null ) ? 0 : model.hashCode() );
+result = prime * result + ( ( serialNumber == null ) ? 0 : serialNumber.hashCode() );
+return result;
+}
+
+@Override
+public boolean equals(Object obj) {
+if ( this == obj )
+return true;
+if ( obj == null )
+return false;
+if ( !( obj instanceof Device ) )
+return false;
+Device other = (Device) obj;
+
+if ( manufacturer == null ) {
+if ( other.manufacturer != null )
+return false;
+}
+else if ( !manufacturer.equals( other.manufacturer ) )
+return false;
+if ( model == null ) {
+if ( other.model != null )
+return false;
+}
+else if ( !model.equals( other.model ) )
+return false;
+if ( serialNumber == null ) {
+if ( other.serialNumber != null )
+return false;
+}
+else if ( !serialNumber.equals( other.serialNumber ) )
+return false;
+return true;
+}
+}

hibernate-search-infinispan/src/test/java/org/hibernate/search/infinispan/sharedIndex/Robot.java

@@ -0,0 +1,42 @@
+/*
+ * 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.infinispan.sharedIndex;
+
+import javax.persistence.Entity;
+
+import org.hibernate.search.annotations.Indexed;
+
+@Entity
+@Indexed(index = "device")
+public class Robot extends Device {
+
+public Robot() {
+super( "Galactic", "Infinity1000", null );
+}
+
+public Robot(String serialNumber) {
+super( "Galactic", "Infinity1000", serialNumber );
+}
+}