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

HADOOP-2503 REST Insert / Select encoding issues 

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@607592 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2007-12-30 21:40:50 +00:00
parent 164bc44b58
commit 6b005b4f3f
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -93,6 +93,8 @@ Trunk (unreleased changes)
deleted
HADOOP-2468 TestRegionServerExit failed in Hadoop-Nightly #338
HADOOP-2467 scanner truncates resultset when > 1 column families
HADOOP-2503 REST Insert / Select encoding issue
(Bryan Duxbury via Stack)
IMPROVEMENTS
HADOOP-2401 Add convenience put method that takes writable

17
src/java/org/apache/hadoop/hbase/rest/TableHandler.java
View File

@ -245,10 +245,13 @@ public class TableHandler extends GenericHandler {
final HttpServletResponse response, final String [] pathSegments)
throws IOException, ServletException {
HTable table = getTable(pathSegments[0]);
// pull the row key out of the path
String row = URLDecoder.decode(pathSegments[2], HConstants.UTF8_ENCODING);
switch(ContentType.getContentType(request.getHeader(CONTENT_TYPE))) {
case XML:
putRowXml(table, request, response, pathSegments);
putRowXml(table, row, request, response, pathSegments);
break;
case MIME:
doNotAcceptable(response, "Don't support multipart/related yet...");
@ -265,8 +268,9 @@ public class TableHandler extends GenericHandler {
* @param pathSegments
* Decode supplied XML and do a put to Hbase.
*/
private void putRowXml(HTable table, final HttpServletRequest request,
final HttpServletResponse response, final String [] pathSegments)
private void putRowXml(HTable table, String row,
final HttpServletRequest request, final HttpServletResponse response,
final String [] pathSegments)
throws IOException, ServletException{
DocumentBuilderFactory docBuilderFactory
@ -292,7 +296,7 @@ public class TableHandler extends GenericHandler {
try{
// start an update
Text key = new Text(pathSegments[2]);
Text key = new Text(row);
lock_id = table.startUpdate(key);
// set the columns from the xml
@ -457,7 +461,10 @@ public class TableHandler extends GenericHandler {
// grab the table we're operating on
HTable table = getTable(getTableName(pathSegments));
Text key = new Text(pathSegments[2]);
// pull the row key out of the path
String row = URLDecoder.decode(pathSegments[2], HConstants.UTF8_ENCODING);
Text key = new Text(row);
String[] columns = request.getParameterValues(COLUMN);