[infinispan-commits] Infinispan SVN: r1227 - in trunk: core/src/main/java/org/infinispan/remoting/transport/jgroups and 2 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Nov 27 10:22:40 EST 2009
Author: manik.surtani at jboss.com
Date: 2009-11-27 10:22:39 -0500 (Fri, 27 Nov 2009)
New Revision: 1227
Modified:
trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java
Log:
Sorted out todos, cleaned up some code
Modified: trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java 2009-11-27 13:03:23 UTC (rev 1226)
+++ trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java 2009-11-27 15:22:39 UTC (rev 1227)
@@ -160,7 +160,17 @@
return log;
}
- // TODO unit test this!!!
+ /**
+ * Retrieves a List of Address of who should be sending state to the joiner (self), given a repl count (numOwners)
+ * for each entry.
+ * <p />
+ * The algorithm essentially works like this. Given a list of all Addresses in the system (ordered by their positions
+ * in the new consistent hash wheel), locate where the current address (self, the joiner) is, on this list. Addresses
+ * from (replCount - 1) positions behind self, and 1 position ahead of self would be sending state.
+ * <p />
+ * @param replCount
+ * @return
+ */
List<Address> getAddressesWhoMaySendStuff(int replCount) {
List<Address> l = new LinkedList<Address>();
List<Address> caches = chNew.getCaches();
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2009-11-27 13:03:23 UTC (rev 1226)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2009-11-27 15:22:39 UTC (rev 1227)
@@ -475,7 +475,7 @@
boolean needNotification = false;
if (newMembers != null) {
- // TODO: Implement breaking stale locks for dead members. This should be in the TxINterceptor or TransactionTable, with a listener on the cache manager.
+ // TODO: Implement breaking stale locks for dead members. This should be in the TxInterceptor or TransactionTable, with a listener on the cache manager.
// if (members != null) {
// we had a membership list before this event. Check to make sure we haven't lost any members,
// and if so, determine what members have been removed
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java 2009-11-27 13:03:23 UTC (rev 1226)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java 2009-11-27 15:22:39 UTC (rev 1227)
@@ -12,7 +12,6 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.util.Map;
/**
*
@@ -55,11 +54,9 @@
fluDemo.createCache(config.getString("InfinispanCfg"));
fluDemo.populateCache(config);
} catch (SAXException e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
System.exit(1);
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
System.exit(2);
}
@@ -83,7 +80,6 @@
try {
Thread.currentThread().sleep(2000);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java 2009-11-27 13:03:23 UTC (rev 1226)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java 2009-11-27 15:22:39 UTC (rev 1227)
@@ -156,7 +156,6 @@
System.out.println("Parsing files....Done");
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java 2009-11-27 13:03:23 UTC (rev 1226)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java 2009-11-27 15:22:39 UTC (rev 1227)
@@ -51,10 +51,8 @@
System.out.println("Processed " + myData.size() + " records from file...");
System.out.println("Number stored in cache=" + cacheImpl.getCacheSize());
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
} catch (SAXException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java 2009-11-27 13:03:23 UTC (rev 1226)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java 2009-11-27 15:22:39 UTC (rev 1227)
@@ -30,17 +30,7 @@
private Cache<String, Nucleotide_Protein_Element> proteinCache;
private Cache<String, Nucleotide_Protein_Element> nucleiodCache;
- /**
- * @see HttpServlet#HttpServlet()
- */
- public CacheSearchServlet() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @see Servlet#init(ServletConfig)
- */
+ @Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
CacheBuilder cacheBuilder = (CacheBuilder) getServletContext().getAttribute("cacheBuilder");
@@ -53,11 +43,13 @@
* @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
* response)
*/
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/jsp/displayVirusDetails.jsp");
dispatcher.forward(request, response);
}
+ @Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
CacheBuilder cacheBuilder = (CacheBuilder) getServletContext().getAttribute("cacheBuilder");
String searchGBAN = request.getParameter("vGBAN");
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java 2009-11-27 13:03:23 UTC (rev 1226)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java 2009-11-27 15:22:39 UTC (rev 1227)
@@ -3,12 +3,12 @@
*/
package org.infinispan.ec2demo.web;
-import java.io.IOException;
+import org.infinispan.ec2demo.CacheBuilder;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import org.infinispan.ec2demo.CacheBuilder;
+import java.io.IOException;
/**
* @author noconnor at redhat.com
@@ -41,7 +41,6 @@
System.out.println("in CacheServletListener...starting cache...done");
context.setAttribute("cacheBuilder", currCacheBuilder);
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
System.out.println("in CacheServletListener...exit");
More information about the infinispan-commits
mailing list