Author: btellier Date: Wed Sep 23 09:31:22 2015 New Revision: 1704793 URL: http://svn.apache.org/viewvc?rev=1704793&view=rev Log: JAMES-1622 Upgrade to HBase 0.94 to handle 127.0.1.1 -- contributed by Raphael Ouazana
Modified: james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java james/server/trunk/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java james/server/trunk/pom.xml Modified: james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java?rev=1704793&r1=1704792&r2=1704793&view=diff ============================================================================== --- james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java (original) +++ james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java Wed Sep 23 09:31:22 2015 @@ -24,7 +24,7 @@ import java.util.List; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -52,7 +52,7 @@ public class HBaseDomainList extends Abs */ @Override public boolean containsDomain(String domain) throws DomainListException { - HTable table = null; + HTableInterface table = null; try { table = TablePool.getInstance().getDomainlistTable(); Get get = new Get(Bytes.toBytes(domain)); @@ -84,7 +84,7 @@ public class HBaseDomainList extends Abs if (containsDomain(lowerCasedDomain)) { throw new DomainListException(lowerCasedDomain + " already exists."); } - HTable table = null; + HTableInterface table = null; try { table = TablePool.getInstance().getDomainlistTable(); Put put = new Put(Bytes.toBytes(lowerCasedDomain)); @@ -107,7 +107,7 @@ public class HBaseDomainList extends Abs @Override public void removeDomain(String domain) throws DomainListException { - HTable table = null; + HTableInterface table = null; try { table = TablePool.getInstance().getDomainlistTable(); Delete delete = new Delete(Bytes.toBytes(domain)); @@ -133,13 +133,13 @@ public class HBaseDomainList extends Abs @Override protected List<String> getDomainListInternal() throws DomainListException { List<String> list = new ArrayList<String>(); - HTable table = null; + HTableInterface table = null; ResultScanner resultScanner = null; try { table = TablePool.getInstance().getDomainlistTable(); Scan scan = new Scan(); scan.addFamily(HDomainList.COLUMN_FAMILY_NAME); - scan.setCaching(table.getScannerCaching() * 2); + scan.setCaching(table.getConfiguration().getInt("hbase.client.scanner.caching", 1) * 2); resultScanner = table.getScanner(scan); Result result; while ((result = resultScanner.next()) != null) { Modified: james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java?rev=1704793&r1=1704792&r2=1704793&view=diff ============================================================================== --- james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java (original) +++ james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java Wed Sep 23 09:31:22 2015 @@ -28,7 +28,7 @@ import java.util.Map; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -75,7 +75,7 @@ public class HBaseRecipientRewriteTable @Override protected Collection<String> getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException { - HTable table = null; + HTableInterface table = null; List<String> list = new ArrayList<String>(); try { table = TablePool.getInstance().getRecipientRewriteTable(); @@ -96,7 +96,7 @@ public class HBaseRecipientRewriteTable return list; } - private void feedUserDomainMappingsList(HTable table, String user, String domain, Collection<String> list) throws + private void feedUserDomainMappingsList(HTableInterface table, String user, String domain, Collection<String> list) throws IOException { Get get = new Get(Bytes.toBytes(getRowKey(user, domain))); Result result = table.get(get); @@ -112,14 +112,14 @@ public class HBaseRecipientRewriteTable */ @Override protected Map<String, Collection<String>> getAllMappingsInternal() throws RecipientRewriteTableException { - HTable table = null; + HTableInterface table = null; ResultScanner resultScanner = null; Map<String, Collection<String>> map = null; try { table = TablePool.getInstance().getRecipientRewriteTable(); Scan scan = new Scan(); scan.addFamily(HRecipientRewriteTable.COLUMN_FAMILY_NAME); - scan.setCaching(table.getScannerCaching() * 2); + scan.setCaching(table.getConfiguration().getInt("hbase.client.scanner.caching", 1) * 2); resultScanner = table.getScanner(scan); Result result; while ((result = resultScanner.next()) != null) { @@ -162,7 +162,7 @@ public class HBaseRecipientRewriteTable */ @Override protected String mapAddressInternal(String user, String domain) throws RecipientRewriteTableException { - HTable table = null; + HTableInterface table = null; String mappings = null; try { table = TablePool.getInstance().getRecipientRewriteTable(); @@ -188,7 +188,7 @@ public class HBaseRecipientRewriteTable return mappings; } - private String getMapping(HTable table, String user, String domain) throws IOException { + private String getMapping(HTableInterface table, String user, String domain) throws IOException { Get get = new Get(Bytes.toBytes(getRowKey(user, domain))); Result result = table.get(get); List<KeyValue> keyValues = result.getColumn(HRecipientRewriteTable.COLUMN_FAMILY_NAME, @@ -239,7 +239,7 @@ public class HBaseRecipientRewriteTable * @throws RecipientRewriteTableException */ private void doRemoveMapping(String user, String domain, String mapping) throws RecipientRewriteTableException { - HTable table = null; + HTableInterface table = null; try { table = TablePool.getInstance().getRecipientRewriteTable(); Delete delete = new Delete(Bytes.toBytes(getRowKey(user, domain))); @@ -268,7 +268,7 @@ public class HBaseRecipientRewriteTable * @throws RecipientRewriteTableException */ private void doAddMapping(String user, String domain, String mapping) throws RecipientRewriteTableException { - HTable table = null; + HTableInterface table = null; try { table = TablePool.getInstance().getRecipientRewriteTable(); Put put = new Put(Bytes.toBytes(getRowKey(user, domain))); Modified: james/server/trunk/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java?rev=1704793&r1=1704792&r2=1704793&view=diff ============================================================================== --- james/server/trunk/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java (original) +++ james/server/trunk/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java Wed Sep 23 09:31:22 2015 @@ -19,12 +19,13 @@ package org.apache.james.system.hbase; import java.io.IOException; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.HBaseAdmin; -import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.HTablePool; import org.apache.james.domainlist.hbase.def.HDomainList; import org.apache.james.rrt.api.RecipientRewriteTable; @@ -85,8 +86,8 @@ public class TablePool { * * @return An instance of {@link HDomainList} */ - public HTable getDomainlistTable() { - return (HTable) htablePool.getTable(HDomainList.TABLE_NAME); + public HTableInterface getDomainlistTable() { + return htablePool.getTable(HDomainList.TABLE_NAME); } /** @@ -94,8 +95,8 @@ public class TablePool { * * @return An instance of {@link RecipientRewriteTable} */ - public HTable getRecipientRewriteTable() { - return (HTable) htablePool.getTable(HRecipientRewriteTable.TABLE_NAME); + public HTableInterface getRecipientRewriteTable() { + return htablePool.getTable(HRecipientRewriteTable.TABLE_NAME); } /** @@ -103,8 +104,8 @@ public class TablePool { * * @return An instance of {@link UsersRepository} */ - public HTable getUsersRepositoryTable() { - return (HTable) htablePool.getTable(HUsersRepository.TABLE_NAME); + public HTableInterface getUsersRepositoryTable() { + return htablePool.getTable(HUsersRepository.TABLE_NAME); } /** Modified: james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java?rev=1704793&r1=1704792&r2=1704793&view=diff ============================================================================== --- james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java (original) +++ james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java Wed Sep 23 09:31:22 2015 @@ -28,7 +28,7 @@ import org.apache.commons.configuration. import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -102,7 +102,7 @@ public class HBaseUsersRepository extend */ @Override public void removeUser(String name) throws UsersRepositoryException { - HTable table = null; + HTableInterface table = null; try { table = TablePool.getInstance().getUsersRepositoryTable(); Delete delete = new Delete(Bytes.toBytes(name)); @@ -150,13 +150,13 @@ public class HBaseUsersRepository extend */ @Override public int countUsers() throws UsersRepositoryException { - HTable table = null; + HTableInterface table = null; ResultScanner resultScanner = null; try { table = TablePool.getInstance().getUsersRepositoryTable(); Scan scan = new Scan(); scan.addFamily(HUsersRepository.COLUMN_FAMILY_NAME); - scan.setCaching(table.getScannerCaching() * 2); + scan.setCaching(table.getConfiguration().getInt("hbase.client.scanner.caching", 1) * 2); resultScanner = table.getScanner(scan); int resultCount = 0; Result result = null; @@ -187,13 +187,13 @@ public class HBaseUsersRepository extend @Override public Iterator<String> list() throws UsersRepositoryException { List<String> list = new ArrayList<String>(); - HTable table = null; + HTableInterface table = null; ResultScanner resultScanner = null; try { table = TablePool.getInstance().getUsersRepositoryTable(); Scan scan = new Scan(); scan.addFamily(HUsersRepository.COLUMN_FAMILY_NAME); - scan.setCaching(table.getScannerCaching() * 2); + scan.setCaching(table.getConfiguration().getInt("hbase.client.scanner.caching", 1) * 2); resultScanner = table.getScanner(scan); Result result; while ((result = resultScanner.next()) != null) { @@ -235,7 +235,7 @@ public class HBaseUsersRepository extend * @throws UsersRepositoryException */ private KeyValue getKeyValue(String username) throws UsersRepositoryException { - HTable table = null; + HTableInterface table = null; try { table = TablePool.getInstance().getUsersRepositoryTable(); Get get = new Get(Bytes.toBytes(username)); @@ -270,7 +270,7 @@ public class HBaseUsersRepository extend throw new UsersRepositoryException(username + " already exists."); } } - HTable table = null; + HTableInterface table = null; try { table = TablePool.getInstance().getUsersRepositoryTable(); Put put = new Put(Bytes.toBytes(username)); Modified: james/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1704793&r1=1704792&r2=1704793&view=diff ============================================================================== --- james/server/trunk/pom.xml (original) +++ james/server/trunk/pom.xml Wed Sep 23 09:31:22 2015 @@ -116,7 +116,7 @@ <camel.version>2.10.3</camel.version> <derby.version>10.9.1.0</derby.version> <hadoop.version>1.1.1</hadoop.version> - <hbase.version>0.92.0</hbase.version> + <hbase.version>0.94.27</hbase.version> <javax.inject.version>1</javax.inject.version> <javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId> <javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org