[Mulgara-svn] r825 - projects/xa2/object-pool/src

[andrae at mulgara.org]

Author: andrae
Date: 2008-04-22 23:53:28 -0700 (Tue, 22 Apr 2008)
New Revision: 825

Modified:
   projects/xa2/object-pool/src/CompBlockTrie.java
   projects/xa2/object-pool/src/CompBlockTrieTest.java
Log:
Needed to change blocksize to an int - short only goes up to 32*1024 - 1!



Modified: projects/xa2/object-pool/src/CompBlockTrie.java
===================================================================
--- projects/xa2/object-pool/src/CompBlockTrie.java	2008-04-23 06:47:18 UTC (rev 824)
+++ projects/xa2/object-pool/src/CompBlockTrie.java	2008-04-23 06:53:28 UTC (rev 825)
@@ -37,10 +37,11 @@
    *   2.00 billion entries by a single I2 index in 49GB.
    *   2.52 trillion entries by a single I3 index in 60TB.
    */ 
-  private short blockSize;
+  private int blockSize;
 
-  public CompBlockTrie(short blockSize) {
+  public CompBlockTrie(int blockSize) {
     assert blockSize > 1024;
+    assert blockSize <= 32*1024;
     this.blockSize = blockSize;
     this.space = (short)((blockSize - 6) / WORST_CASE_ENTRY_SIZE); // -6 leaves room for header info.
   }

Modified: projects/xa2/object-pool/src/CompBlockTrieTest.java
===================================================================
--- projects/xa2/object-pool/src/CompBlockTrieTest.java	2008-04-23 06:47:18 UTC (rev 824)
+++ projects/xa2/object-pool/src/CompBlockTrieTest.java	2008-04-23 06:53:28 UTC (rev 825)
@@ -32,7 +32,7 @@
 //    testLoadWithRandomFile(new File("/dev/urandom"));
   }
 
-  private static final short BLOCK_SIZE = (short)(32 * 1024);
+  private static final int BLOCK_SIZE = 32 * 1024;
   public static void testWithFile(File file) throws Exception {
     Map<byte[], Long> namesMap = new HashMap<byte[], Long>();