summaryrefslogtreecommitdiffstats
path: root/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase
diff options
context:
space:
mode:
Diffstat (limited to 'collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase')
-rw-r--r--collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseDatatabase.java37
-rw-r--r--collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseGroup.java76
-rw-r--r--collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseSession.java37
3 files changed, 96 insertions, 54 deletions
diff --git a/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseDatatabase.java b/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseDatatabase.java
index 5d49fd76da..962a76eb5d 100644
--- a/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseDatatabase.java
+++ b/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseDatatabase.java
@@ -29,30 +29,27 @@ import org.apache.tuscany.nosqldatastore.Group;
import java.io.IOException;
public class HBaseDatatabase implements Database{
-
+
private HTable table;
private HBaseAdmin admin;
- HBaseDatatabase(String dbname, HBaseAdmin admin){
+ HBaseDatatabase(String dbname, HBaseAdmin admin) throws IOException {
Configuration conf = HBaseConfiguration.create();
- try {
- try{
- HTableDescriptor descriptor = new HTableDescriptor(dbname);
- admin.createTable(descriptor);
- } catch (MasterNotRunningException e) {
- e.printStackTrace();
- } catch (ZooKeeperConnectionException e) {
- e.printStackTrace();
- } catch (TableExistsException e){
- System.out.println("connected to existing database....");
- } finally {
- table = new HTable(conf,dbname);
- System.out.println(new String(table.getTableName()));
- this.admin = admin;
- table.flushCommits();
- }
- }catch (IOException ex) {
- ex.printStackTrace();
+
+ try{
+ HTableDescriptor descriptor = new HTableDescriptor(dbname);
+ admin.createTable(descriptor);
+ } catch (MasterNotRunningException e) {
+ e.printStackTrace();
+ } catch (ZooKeeperConnectionException e) {
+ e.printStackTrace();
+ } catch (TableExistsException e){
+ System.out.println("connected to existing database....");
+ } finally {
+ table = new HTable(conf,dbname);
+ System.out.println(new String(table.getTableName()));
+ this.admin = admin;
+ table.flushCommits();
}
}
diff --git a/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseGroup.java b/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseGroup.java
index f57b70ee60..24cab2d6de 100644
--- a/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseGroup.java
+++ b/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseGroup.java
@@ -23,6 +23,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.*;
import org.apache.tuscany.nosqldatastore.Group;
+import org.apache.tuscany.nosqldatastore.exception.DuplicateEntryException;
+import org.apache.tuscany.nosqldatastore.exception.EntryNotFoundException;
import java.io.IOException;
import java.util.HashMap;
@@ -38,44 +40,72 @@ public class HBaseGroup implements Group {
this.cf = cf;
}
- public void addEntry(String key, Object value) {
- Put put = new Put(key.getBytes());
- put.add(cf.getBytes(),key.getBytes(),((String)value).getBytes());
- try {
- table.put(put);
- table.flushCommits();
- } catch (IOException e) {
- System.out.println("Error: Adding the entry for the Key "+key);
- e.printStackTrace();
+ public void addEntry(String key, String value) throws DuplicateEntryException {
+ if(get(key) == null){
+ Put put = new Put(key.getBytes());
+ put.add(cf.getBytes(),key.getBytes(),value.getBytes());
+ try {
+ table.put(put);
+ table.flushCommits();
+ } catch (IOException e) {
+ System.out.println("Error: Adding the entry for the Key "+key);
+ e.printStackTrace();
+ }
+ } else {
+ throw new DuplicateEntryException("Duplicate entry for key "+key);
}
+ }
+ public void updateEntry(String key, String value) throws EntryNotFoundException {
+ if(get(key) != null){
+ Put put = new Put(key.getBytes());
+ put.add(cf.getBytes(),key.getBytes(),value.getBytes());
+ try {
+ table.put(put);
+ table.flushCommits();
+ } catch (IOException e) {
+ System.out.println("Error: Adding the entry for the Key "+key);
+ e.printStackTrace();
+ }
+ } else {
+ throw new EntryNotFoundException("Entry does not exist for key "+key);
+ }
}
- public void updateEntry(String key, Object value) {
- addEntry(key,value);
+ public void deleteEntry(String key) throws EntryNotFoundException {
+ if(get(key) != null){
+ Delete delete = new Delete(key.getBytes());
+ delete.deleteColumn(cf.getBytes(), key.getBytes());
+ try {
+ table.delete(delete);
+ table.flushCommits();
+ } catch (IOException e) {
+ System.out.println("Error: Deleting the entry for the Key "+key);
+ e.printStackTrace();
+ }
+ } else {
+ throw new EntryNotFoundException("Entry does not exist for key "+key);
+ }
}
- public void deleteEntry(String key) {
- Delete delete = new Delete(key.getBytes());
- delete.deleteColumn(cf.getBytes(), key.getBytes());
- try {
- table.delete(delete);
- table.flushCommits();
- } catch (IOException e) {
- System.out.println("Error: Deleting the entry for the Key "+key);
- e.printStackTrace();
+ public String getEntry(String key) throws EntryNotFoundException {
+ byte[] b;
+ if((b = get(key)) != null){
+ return new String(b);
+ } else {
+ throw new EntryNotFoundException("Entry does not exist for key "+key);
}
}
- public Object getValue(String key) {
+ private byte[] get(String key){
Result result = null;
Get get = new Get(key.getBytes());
try {
result = table.get(get);
} catch (IOException e) {
- System.out.println("Error: Retrieving the value or the Key "+key);
+ System.out.println("Error: Getting the entry for the Key "+key);
e.printStackTrace();
}
- return new String(result.getValue(cf.getBytes(),key.getBytes()));
+ return result.getValue(cf.getBytes(),key.getBytes());
}
}
diff --git a/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseSession.java b/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseSession.java
index 83648eadc0..6279c75181 100644
--- a/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseSession.java
+++ b/collaboration/GSoC-2011-Eranda/hbase/src/main/java/org/apache/tuscany/nosqldatastore/hbase/HBaseSession.java
@@ -26,6 +26,8 @@ import org.apache.hadoop.hbase.ZooKeeperConnectionException;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.tuscany.nosqldatastore.Database;
import org.apache.tuscany.nosqldatastore.Session;
+import org.apache.tuscany.nosqldatastore.exception.DatabaseNotFoundException;
+import org.apache.tuscany.nosqldatastore.exception.SessionException;
import java.io.IOException;
@@ -46,23 +48,36 @@ public class HBaseSession implements Session{
}
}
- public Database createDatabase(String databaseName) {
- Database database = new HBaseDatatabase(databaseName, admin);
- return database;
+ public Database createDatabase(String databaseName) throws SessionException {
+ Database database = null;
+ try {
+ database = new HBaseDatatabase(databaseName, admin);
+ } catch (IOException e) {
+ throw new SessionException("Session Error");
+ }
+ return database;
}
- public Database getDatabase(String databaseName) {
- Database database = new HBaseDatatabase(databaseName, admin);
- return database;
+ public Database getDatabase(String databaseName) throws SessionException {
+ Database database = null;
+ try {
+ database = new HBaseDatatabase(databaseName, admin);
+ } catch (IOException e) {
+ throw new SessionException("Session Error");
+ }
+ return database;
}
- public void deleteDatabase(String databaseName) {
+ public void deleteDatabase(String databaseName) throws DatabaseNotFoundException, SessionException {
try {
- admin.disableTable(databaseName);
- admin.deleteTable(databaseName);
+ if(admin.tableExists(databaseName)){
+ admin.disableTable(databaseName);
+ admin.deleteTable(databaseName);
+ } else {
+ throw new DatabaseNotFoundException("Database "+databaseName+" not found");
+ }
} catch (IOException e) {
- System.out.println("Error: Creating the database "+databaseName);
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ throw new SessionException("Session Error");
}
}
}