Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove vestigial and incorrect deletes 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@789193 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Kyle Purtell 2009-06-29 02:43:59 +00:00
parent 2fed7e7c87
commit c88a9b2070
1 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java
View File

@ -133,33 +133,7 @@ public class RowResource implements Constants {
} }
} }
private void deleteRow() {
HTablePool pool;
try {
pool = RESTServlet.getInstance().getTablePool(this.table);
} catch (IOException e) {
throw new WebApplicationException(e,
Response.Status.INTERNAL_SERVER_ERROR);
}
HTable table = null;
try {
table = pool.get();
table.delete(new Delete(rowspec.getRow()));
table.flushCommits();
} catch (IOException e) {
throw new WebApplicationException(e,
Response.Status.SERVICE_UNAVAILABLE);
} finally {
if (table != null) {
pool.put(table);
}
}
}
private Response update(CellSetModel model, boolean replace) { private Response update(CellSetModel model, boolean replace) {
if (replace) {
deleteRow();
}
HTablePool pool; HTablePool pool;
try { try {
pool = RESTServlet.getInstance().getTablePool(this.table); pool = RESTServlet.getInstance().getTablePool(this.table);
@ -173,11 +147,6 @@ public class RowResource implements Constants {
for (RowModel row: model.getRows()) { for (RowModel row: model.getRows()) {
Put put = new Put(row.getKey()); Put put = new Put(row.getKey());
for (CellModel cell: row.getCells()) { for (CellModel cell: row.getCells()) {
if (LOG.isDebugEnabled()) {
LOG.debug("update cell '" +
Bytes.toStringBinary(cell.getColumn()) + "' @" +
cell.getTimestamp() + " length " + cell.getValue().length);
}
byte [][] parts = KeyValue.parseColumn(cell.getColumn()); byte [][] parts = KeyValue.parseColumn(cell.getColumn());
if (cell.hasUserTimestamp()) { if (cell.hasUserTimestamp()) {
put.add(parts[0], parts[1], cell.getTimestamp(), cell.getValue()); put.add(parts[0], parts[1], cell.getTimestamp(), cell.getValue());
@ -186,6 +155,9 @@ public class RowResource implements Constants {
} }
} }
table.put(put); table.put(put);
if (LOG.isDebugEnabled()) {
LOG.debug("PUT " + put.toString());
}
} }
table.flushCommits(); table.flushCommits();
ResponseBuilder response = Response.ok(); ResponseBuilder response = Response.ok();
@ -202,9 +174,6 @@ public class RowResource implements Constants {
private Response updateBinary(byte[] message, HttpHeaders headers, private Response updateBinary(byte[] message, HttpHeaders headers,
boolean replace) { boolean replace) {
if (replace) {
deleteRow();
}
HTablePool pool; HTablePool pool;
try { try {
pool = RESTServlet.getInstance().getTablePool(this.table); pool = RESTServlet.getInstance().getTablePool(this.table);
@ -236,10 +205,6 @@ public class RowResource implements Constants {
if (column == null) { if (column == null) {
throw new WebApplicationException(Response.Status.BAD_REQUEST); throw new WebApplicationException(Response.Status.BAD_REQUEST);
} }
if (LOG.isDebugEnabled()) {
LOG.debug("update cell '" + Bytes.toStringBinary(column) + "' @" +
timestamp + " length " + message.length);
}
Put put = new Put(row); Put put = new Put(row);
byte parts[][] = KeyValue.parseColumn(column); byte parts[][] = KeyValue.parseColumn(column);
if (timestamp >= 0) { if (timestamp >= 0) {
@ -249,6 +214,9 @@ public class RowResource implements Constants {
} }
table = pool.get(); table = pool.get();
table.put(put); table.put(put);
if (LOG.isDebugEnabled()) {
LOG.debug("PUT " + put.toString());
}
table.flushCommits(); table.flushCommits();
return Response.ok().build(); return Response.ok().build();
} catch (IOException e) { } catch (IOException e) {
@ -328,6 +296,9 @@ public class RowResource implements Constants {
try { try {
table = pool.get(); table = pool.get();
table.delete(delete); table.delete(delete);
if (LOG.isDebugEnabled()) {
LOG.debug("DELETE " + delete.toString());
}
table.flushCommits(); table.flushCommits();
} catch (IOException e) { } catch (IOException e) {
throw new WebApplicationException(e, throw new WebApplicationException(e,