hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [18/41] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Date Sat, 29 Apr 2017 14:58:55 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6fbeb554/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResource.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResource.html b/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResource.html
index 2d0692c..7b0ad70 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResource.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/RowResource.html
@@ -147,520 +147,526 @@
 <span class="sourceLineNo">139</span>    if (!rowspec.hasColumns() || rowspec.getColumns().length &gt; 1) {<a name="line.139"></a>
 <span class="sourceLineNo">140</span>      servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.140"></a>
 <span class="sourceLineNo">141</span>      return Response.status(Response.Status.BAD_REQUEST).type(MIMETYPE_TEXT)<a name="line.141"></a>
-<span class="sourceLineNo">142</span>          .entity("Bad request: Either 0 or more than 1 columns specified." + CRLF).build();<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    MultivaluedMap&lt;String, String&gt; params = uriInfo.getQueryParameters();<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    try {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      ResultGenerator generator =<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        ResultGenerator.fromRowSpec(tableResource.getName(), rowspec, null,<a name="line.147"></a>
-<span class="sourceLineNo">148</span>          !params.containsKey(NOCACHE_PARAM_NAME));<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      if (!generator.hasNext()) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>        servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        return Response.status(Response.Status.NOT_FOUND)<a name="line.151"></a>
-<span class="sourceLineNo">152</span>          .type(MIMETYPE_TEXT).entity("Not found" + CRLF)<a name="line.152"></a>
-<span class="sourceLineNo">153</span>          .build();<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      Cell value = generator.next();<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      ResponseBuilder response = Response.ok(CellUtil.cloneValue(value));<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      response.header("X-Timestamp", value.getTimestamp());<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      servlet.getMetrics().incrementSucessfulGetRequests(1);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      return response.build();<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    } catch (Exception e) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      return processException(e);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
-<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>  Response update(final CellSetModel model, final boolean replace) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    servlet.getMetrics().incrementRequests(1);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    if (servlet.isReadOnly()) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      return Response.status(Response.Status.FORBIDDEN)<a name="line.170"></a>
-<span class="sourceLineNo">171</span>        .type(MIMETYPE_TEXT).entity("Forbidden" + CRLF)<a name="line.171"></a>
-<span class="sourceLineNo">172</span>        .build();<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>    if (CHECK_PUT.equalsIgnoreCase(check)) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      return checkAndPut(model);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    } else if (CHECK_DELETE.equalsIgnoreCase(check)) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      return checkAndDelete(model);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    } else if (check != null &amp;&amp; check.length() &gt; 0) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      return Response.status(Response.Status.BAD_REQUEST)<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        .type(MIMETYPE_TEXT).entity("Invalid check value '" + check + "'" + CRLF)<a name="line.181"></a>
-<span class="sourceLineNo">182</span>        .build();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    Table table = null;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    try {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      List&lt;RowModel&gt; rows = model.getRows();<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      List&lt;Put&gt; puts = new ArrayList&lt;&gt;();<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      for (RowModel row: rows) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        byte[] key = row.getKey();<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        if (key == null) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>          key = rowspec.getRow();<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        }<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        if (key == null) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>          servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>          return Response.status(Response.Status.BAD_REQUEST)<a name="line.196"></a>
-<span class="sourceLineNo">197</span>            .type(MIMETYPE_TEXT).entity("Bad request: Row key not specified." + CRLF)<a name="line.197"></a>
-<span class="sourceLineNo">198</span>            .build();<a name="line.198"></a>
+<span class="sourceLineNo">142</span>          .entity("Bad request: Default 'GET' method only works if there is exactly 1 column " +<a name="line.142"></a>
+<span class="sourceLineNo">143</span>                  "in the row. Using the 'Accept' header with one of these formats lets you " +<a name="line.143"></a>
+<span class="sourceLineNo">144</span>                  "retrieve the entire row if it has multiple columns: " +<a name="line.144"></a>
+<span class="sourceLineNo">145</span>                  // Same as the @Produces list for the get method.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>                  MIMETYPE_XML + ", " + MIMETYPE_JSON + ", " +<a name="line.146"></a>
+<span class="sourceLineNo">147</span>                  MIMETYPE_PROTOBUF + ", " + MIMETYPE_PROTOBUF_IETF +<a name="line.147"></a>
+<span class="sourceLineNo">148</span>                  CRLF).build();<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    MultivaluedMap&lt;String, String&gt; params = uriInfo.getQueryParameters();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    try {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      ResultGenerator generator =<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        ResultGenerator.fromRowSpec(tableResource.getName(), rowspec, null,<a name="line.153"></a>
+<span class="sourceLineNo">154</span>          !params.containsKey(NOCACHE_PARAM_NAME));<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      if (!generator.hasNext()) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>        servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>        return Response.status(Response.Status.NOT_FOUND)<a name="line.157"></a>
+<span class="sourceLineNo">158</span>          .type(MIMETYPE_TEXT).entity("Not found" + CRLF)<a name="line.158"></a>
+<span class="sourceLineNo">159</span>          .build();<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      Cell value = generator.next();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      ResponseBuilder response = Response.ok(CellUtil.cloneValue(value));<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      response.header("X-Timestamp", value.getTimestamp());<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      servlet.getMetrics().incrementSucessfulGetRequests(1);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      return response.build();<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    } catch (Exception e) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      servlet.getMetrics().incrementFailedGetRequests(1);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      return processException(e);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>  Response update(final CellSetModel model, final boolean replace) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    servlet.getMetrics().incrementRequests(1);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    if (servlet.isReadOnly()) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      return Response.status(Response.Status.FORBIDDEN)<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        .type(MIMETYPE_TEXT).entity("Forbidden" + CRLF)<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        .build();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>    if (CHECK_PUT.equalsIgnoreCase(check)) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      return checkAndPut(model);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    } else if (CHECK_DELETE.equalsIgnoreCase(check)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      return checkAndDelete(model);<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    } else if (check != null &amp;&amp; check.length() &gt; 0) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      return Response.status(Response.Status.BAD_REQUEST)<a name="line.186"></a>
+<span class="sourceLineNo">187</span>        .type(MIMETYPE_TEXT).entity("Invalid check value '" + check + "'" + CRLF)<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        .build();<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>    Table table = null;<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    try {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      List&lt;RowModel&gt; rows = model.getRows();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      List&lt;Put&gt; puts = new ArrayList&lt;&gt;();<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      for (RowModel row: rows) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>        byte[] key = row.getKey();<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        if (key == null) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>          key = rowspec.getRow();<a name="line.198"></a>
 <span class="sourceLineNo">199</span>        }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        Put put = new Put(key);<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        int i = 0;<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        for (CellModel cell: row.getCells()) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>          byte[] col = cell.getColumn();<a name="line.203"></a>
-<span class="sourceLineNo">204</span>          if (col == null) try {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>            col = rowspec.getColumns()[i++];<a name="line.205"></a>
-<span class="sourceLineNo">206</span>          } catch (ArrayIndexOutOfBoundsException e) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>            col = null;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>          }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>          if (col == null) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>            servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.211"></a>
-<span class="sourceLineNo">212</span>              .type(MIMETYPE_TEXT).entity("Bad request: Column found to be null." + CRLF)<a name="line.212"></a>
-<span class="sourceLineNo">213</span>              .build();<a name="line.213"></a>
+<span class="sourceLineNo">200</span>        if (key == null) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>          servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>          return Response.status(Response.Status.BAD_REQUEST)<a name="line.202"></a>
+<span class="sourceLineNo">203</span>            .type(MIMETYPE_TEXT).entity("Bad request: Row key not specified." + CRLF)<a name="line.203"></a>
+<span class="sourceLineNo">204</span>            .build();<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        }<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        Put put = new Put(key);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        int i = 0;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>        for (CellModel cell: row.getCells()) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>          byte[] col = cell.getColumn();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>          if (col == null) try {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>            col = rowspec.getColumns()[i++];<a name="line.211"></a>
+<span class="sourceLineNo">212</span>          } catch (ArrayIndexOutOfBoundsException e) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>            col = null;<a name="line.213"></a>
 <span class="sourceLineNo">214</span>          }<a name="line.214"></a>
-<span class="sourceLineNo">215</span>          byte [][] parts = KeyValue.parseColumn(col);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>          if (parts.length != 2) {<a name="line.216"></a>
+<span class="sourceLineNo">215</span>          if (col == null) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>            servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.216"></a>
 <span class="sourceLineNo">217</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.217"></a>
-<span class="sourceLineNo">218</span>              .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.218"></a>
+<span class="sourceLineNo">218</span>              .type(MIMETYPE_TEXT).entity("Bad request: Column found to be null." + CRLF)<a name="line.218"></a>
 <span class="sourceLineNo">219</span>              .build();<a name="line.219"></a>
 <span class="sourceLineNo">220</span>          }<a name="line.220"></a>
-<span class="sourceLineNo">221</span>          put.addImmutable(parts[0], parts[1], cell.getTimestamp(), cell.getValue());<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>        puts.add(put);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        if (LOG.isTraceEnabled()) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>          LOG.trace("PUT " + put.toString());<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        }<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      table = servlet.getTable(tableResource.getName());<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      table.put(puts);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      ResponseBuilder response = Response.ok();<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      servlet.getMetrics().incrementSucessfulPutRequests(1);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      return response.build();<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    } catch (Exception e) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      return processException(e);<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    } finally {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      if (table != null) try {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        table.close();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      } catch (IOException ioe) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        LOG.debug("Exception received while closing the table", ioe);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
-<span class="sourceLineNo">243</span>  }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>  // This currently supports only update of one row at a time.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  Response updateBinary(final byte[] message, final HttpHeaders headers,<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      final boolean replace) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    servlet.getMetrics().incrementRequests(1);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    if (servlet.isReadOnly()) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      return Response.status(Response.Status.FORBIDDEN)<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        .type(MIMETYPE_TEXT).entity("Forbidden" + CRLF)<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        .build();<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    }<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    Table table = null;<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    try {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      byte[] row = rowspec.getRow();<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      byte[][] columns = rowspec.getColumns();<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      byte[] column = null;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      if (columns != null) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        column = columns[0];<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      long timestamp = HConstants.LATEST_TIMESTAMP;<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      List&lt;String&gt; vals = headers.getRequestHeader("X-Row");<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      if (vals != null &amp;&amp; !vals.isEmpty()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>        row = Bytes.toBytes(vals.get(0));<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      vals = headers.getRequestHeader("X-Column");<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      if (vals != null &amp;&amp; !vals.isEmpty()) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>        column = Bytes.toBytes(vals.get(0));<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      }<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      vals = headers.getRequestHeader("X-Timestamp");<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      if (vals != null &amp;&amp; !vals.isEmpty()) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        timestamp = Long.parseLong(vals.get(0));<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      if (column == null) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            .type(MIMETYPE_TEXT).entity("Bad request: Column found to be null." + CRLF)<a name="line.279"></a>
-<span class="sourceLineNo">280</span>            .build();<a name="line.280"></a>
+<span class="sourceLineNo">221</span>          byte [][] parts = KeyValue.parseColumn(col);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>          if (parts.length != 2) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.223"></a>
+<span class="sourceLineNo">224</span>              .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.224"></a>
+<span class="sourceLineNo">225</span>              .build();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>          }<a name="line.226"></a>
+<span class="sourceLineNo">227</span>          put.addImmutable(parts[0], parts[1], cell.getTimestamp(), cell.getValue());<a name="line.227"></a>
+<span class="sourceLineNo">228</span>        }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        puts.add(put);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        if (LOG.isTraceEnabled()) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>          LOG.trace("PUT " + put.toString());<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        }<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      }<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      table = servlet.getTable(tableResource.getName());<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      table.put(puts);<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      ResponseBuilder response = Response.ok();<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      servlet.getMetrics().incrementSucessfulPutRequests(1);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      return response.build();<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    } catch (Exception e) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      return processException(e);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    } finally {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      if (table != null) try {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        table.close();<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      } catch (IOException ioe) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        LOG.debug("Exception received while closing the table", ioe);<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>  }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>  // This currently supports only update of one row at a time.<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  Response updateBinary(final byte[] message, final HttpHeaders headers,<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      final boolean replace) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    servlet.getMetrics().incrementRequests(1);<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    if (servlet.isReadOnly()) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      return Response.status(Response.Status.FORBIDDEN)<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        .type(MIMETYPE_TEXT).entity("Forbidden" + CRLF)<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        .build();<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    Table table = null;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    try {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      byte[] row = rowspec.getRow();<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      byte[][] columns = rowspec.getColumns();<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      byte[] column = null;<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      if (columns != null) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>        column = columns[0];<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      }<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      long timestamp = HConstants.LATEST_TIMESTAMP;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      List&lt;String&gt; vals = headers.getRequestHeader("X-Row");<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      if (vals != null &amp;&amp; !vals.isEmpty()) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span>        row = Bytes.toBytes(vals.get(0));<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      }<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      vals = headers.getRequestHeader("X-Column");<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      if (vals != null &amp;&amp; !vals.isEmpty()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>        column = Bytes.toBytes(vals.get(0));<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      }<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      vals = headers.getRequestHeader("X-Timestamp");<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      if (vals != null &amp;&amp; !vals.isEmpty()) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        timestamp = Long.parseLong(vals.get(0));<a name="line.280"></a>
 <span class="sourceLineNo">281</span>      }<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      Put put = new Put(row);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      byte parts[][] = KeyValue.parseColumn(column);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      if (parts.length != 2) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.286"></a>
-<span class="sourceLineNo">287</span>          .build();<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      put.addImmutable(parts[0], parts[1], timestamp, message);<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      table = servlet.getTable(tableResource.getName());<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      table.put(put);<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      if (LOG.isTraceEnabled()) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        LOG.trace("PUT " + put.toString());<a name="line.293"></a>
+<span class="sourceLineNo">282</span>      if (column == null) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.284"></a>
+<span class="sourceLineNo">285</span>            .type(MIMETYPE_TEXT).entity("Bad request: Column found to be null." + CRLF)<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            .build();<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      }<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      Put put = new Put(row);<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      byte parts[][] = KeyValue.parseColumn(column);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      if (parts.length != 2) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.291"></a>
+<span class="sourceLineNo">292</span>          .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.292"></a>
+<span class="sourceLineNo">293</span>          .build();<a name="line.293"></a>
 <span class="sourceLineNo">294</span>      }<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      servlet.getMetrics().incrementSucessfulPutRequests(1);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      return Response.ok().build();<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    } catch (Exception e) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      return processException(e);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    } finally {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      if (table != null) try {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        table.close();<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      } catch (IOException ioe) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        LOG.debug("Exception received while closing the table", ioe);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>  }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span>  @PUT<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  @Consumes({MIMETYPE_XML, MIMETYPE_JSON, MIMETYPE_PROTOBUF,<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    MIMETYPE_PROTOBUF_IETF})<a name="line.311"></a>
-<span class="sourceLineNo">312</span>  public Response put(final CellSetModel model,<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      final @Context UriInfo uriInfo) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    if (LOG.isTraceEnabled()) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      LOG.trace("PUT " + uriInfo.getAbsolutePath()<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        + " " + uriInfo.getQueryParameters());<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    }<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    return update(model, true);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>  }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>  @PUT<a name="line.321"></a>
-<span class="sourceLineNo">322</span>  @Consumes(MIMETYPE_BINARY)<a name="line.322"></a>
-<span class="sourceLineNo">323</span>  public Response putBinary(final byte[] message,<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      final @Context UriInfo uriInfo, final @Context HttpHeaders headers) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    if (LOG.isTraceEnabled()) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      LOG.trace("PUT " + uriInfo.getAbsolutePath() + " as "+ MIMETYPE_BINARY);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    return updateBinary(message, headers, true);<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  @POST<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  @Consumes({MIMETYPE_XML, MIMETYPE_JSON, MIMETYPE_PROTOBUF,<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    MIMETYPE_PROTOBUF_IETF})<a name="line.333"></a>
-<span class="sourceLineNo">334</span>  public Response post(final CellSetModel model,<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      final @Context UriInfo uriInfo) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    if (LOG.isTraceEnabled()) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      LOG.trace("POST " + uriInfo.getAbsolutePath()<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        + " " + uriInfo.getQueryParameters());<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    return update(model, false);<a name="line.340"></a>
-<span class="sourceLineNo">341</span>  }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>  @POST<a name="line.343"></a>
-<span class="sourceLineNo">344</span>  @Consumes(MIMETYPE_BINARY)<a name="line.344"></a>
-<span class="sourceLineNo">345</span>  public Response postBinary(final byte[] message,<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      final @Context UriInfo uriInfo, final @Context HttpHeaders headers) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    if (LOG.isTraceEnabled()) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      LOG.trace("POST " + uriInfo.getAbsolutePath() + " as "+MIMETYPE_BINARY);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    }<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    return updateBinary(message, headers, false);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>  }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>  @DELETE<a name="line.353"></a>
-<span class="sourceLineNo">354</span>  public Response delete(final @Context UriInfo uriInfo) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    if (LOG.isTraceEnabled()) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      LOG.trace("DELETE " + uriInfo.getAbsolutePath());<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    servlet.getMetrics().incrementRequests(1);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    if (servlet.isReadOnly()) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      return Response.status(Response.Status.FORBIDDEN)<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        .type(MIMETYPE_TEXT).entity("Forbidden" + CRLF)<a name="line.362"></a>
-<span class="sourceLineNo">363</span>        .build();<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    Delete delete = null;<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    if (rowspec.hasTimestamp())<a name="line.366"></a>
-<span class="sourceLineNo">367</span>      delete = new Delete(rowspec.getRow(), rowspec.getTimestamp());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    else<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      delete = new Delete(rowspec.getRow());<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>    for (byte[] column: rowspec.getColumns()) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      byte[][] split = KeyValue.parseColumn(column);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      if (rowspec.hasTimestamp()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        if (split.length == 1) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span>          delete.addFamily(split[0], rowspec.getTimestamp());<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        } else if (split.length == 2) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>          delete.addColumns(split[0], split[1], rowspec.getTimestamp());<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        } else {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          return Response.status(Response.Status.BAD_REQUEST)<a name="line.379"></a>
-<span class="sourceLineNo">380</span>            .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.380"></a>
-<span class="sourceLineNo">381</span>            .build();<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        }<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      } else {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>        if (split.length == 1) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>          delete.addFamily(split[0]);<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        } else if (split.length == 2) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>          delete.addColumns(split[0], split[1]);<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        } else {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>          return Response.status(Response.Status.BAD_REQUEST)<a name="line.389"></a>
-<span class="sourceLineNo">390</span>            .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            .build();<a name="line.391"></a>
-<span class="sourceLineNo">392</span>        }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      }<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    }<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    Table table = null;<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    try {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      table = servlet.getTable(tableResource.getName());<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      table.delete(delete);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      servlet.getMetrics().incrementSucessfulDeleteRequests(1);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      if (LOG.isTraceEnabled()) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        LOG.trace("DELETE " + delete.toString());<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    } catch (Exception e) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      return processException(e);<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    } finally {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      if (table != null) try {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        table.close();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      } catch (IOException ioe) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        LOG.debug("Exception received while closing the table", ioe);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      }<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    }<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    return Response.ok().build();<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>  /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span>   * Validates the input request parameters, parses columns from CellSetModel,<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   * and invokes checkAndPut on HTable.<a name="line.418"></a>
-<span class="sourceLineNo">419</span>   *<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   * @param model instance of CellSetModel<a name="line.420"></a>
-<span class="sourceLineNo">421</span>   * @return Response 200 OK, 304 Not modified, 400 Bad request<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   */<a name="line.422"></a>
-<span class="sourceLineNo">423</span>  Response checkAndPut(final CellSetModel model) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    Table table = null;<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    try {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      table = servlet.getTable(tableResource.getName());<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      if (model.getRows().size() != 1) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        return Response.status(Response.Status.BAD_REQUEST).type(MIMETYPE_TEXT)<a name="line.429"></a>
-<span class="sourceLineNo">430</span>            .entity("Bad request: Number of rows specified is not 1." + CRLF).build();<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>      RowModel rowModel = model.getRows().get(0);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      byte[] key = rowModel.getKey();<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      if (key == null) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span>        key = rowspec.getRow();<a name="line.436"></a>
+<span class="sourceLineNo">295</span>      put.addImmutable(parts[0], parts[1], timestamp, message);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      table = servlet.getTable(tableResource.getName());<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      table.put(put);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      if (LOG.isTraceEnabled()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>        LOG.trace("PUT " + put.toString());<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      servlet.getMetrics().incrementSucessfulPutRequests(1);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      return Response.ok().build();<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    } catch (Exception e) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      return processException(e);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    } finally {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      if (table != null) try {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        table.close();<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      } catch (IOException ioe) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        LOG.debug("Exception received while closing the table", ioe);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      }<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
+<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>  @PUT<a name="line.315"></a>
+<span class="sourceLineNo">316</span>  @Consumes({MIMETYPE_XML, MIMETYPE_JSON, MIMETYPE_PROTOBUF,<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    MIMETYPE_PROTOBUF_IETF})<a name="line.317"></a>
+<span class="sourceLineNo">318</span>  public Response put(final CellSetModel model,<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      final @Context UriInfo uriInfo) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    if (LOG.isTraceEnabled()) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      LOG.trace("PUT " + uriInfo.getAbsolutePath()<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        + " " + uriInfo.getQueryParameters());<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    }<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    return update(model, true);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>  @PUT<a name="line.327"></a>
+<span class="sourceLineNo">328</span>  @Consumes(MIMETYPE_BINARY)<a name="line.328"></a>
+<span class="sourceLineNo">329</span>  public Response putBinary(final byte[] message,<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      final @Context UriInfo uriInfo, final @Context HttpHeaders headers) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    if (LOG.isTraceEnabled()) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      LOG.trace("PUT " + uriInfo.getAbsolutePath() + " as "+ MIMETYPE_BINARY);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    return updateBinary(message, headers, true);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>  @POST<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  @Consumes({MIMETYPE_XML, MIMETYPE_JSON, MIMETYPE_PROTOBUF,<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    MIMETYPE_PROTOBUF_IETF})<a name="line.339"></a>
+<span class="sourceLineNo">340</span>  public Response post(final CellSetModel model,<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      final @Context UriInfo uriInfo) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    if (LOG.isTraceEnabled()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      LOG.trace("POST " + uriInfo.getAbsolutePath()<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        + " " + uriInfo.getQueryParameters());<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    }<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    return update(model, false);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>  }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>  @POST<a name="line.349"></a>
+<span class="sourceLineNo">350</span>  @Consumes(MIMETYPE_BINARY)<a name="line.350"></a>
+<span class="sourceLineNo">351</span>  public Response postBinary(final byte[] message,<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      final @Context UriInfo uriInfo, final @Context HttpHeaders headers) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    if (LOG.isTraceEnabled()) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      LOG.trace("POST " + uriInfo.getAbsolutePath() + " as "+MIMETYPE_BINARY);<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    }<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    return updateBinary(message, headers, false);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>  }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span>  @DELETE<a name="line.359"></a>
+<span class="sourceLineNo">360</span>  public Response delete(final @Context UriInfo uriInfo) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    if (LOG.isTraceEnabled()) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      LOG.trace("DELETE " + uriInfo.getAbsolutePath());<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    }<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    servlet.getMetrics().incrementRequests(1);<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    if (servlet.isReadOnly()) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>      return Response.status(Response.Status.FORBIDDEN)<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        .type(MIMETYPE_TEXT).entity("Forbidden" + CRLF)<a name="line.368"></a>
+<span class="sourceLineNo">369</span>        .build();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    }<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    Delete delete = null;<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    if (rowspec.hasTimestamp())<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      delete = new Delete(rowspec.getRow(), rowspec.getTimestamp());<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    else<a name="line.374"></a>
+<span class="sourceLineNo">375</span>      delete = new Delete(rowspec.getRow());<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>    for (byte[] column: rowspec.getColumns()) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      byte[][] split = KeyValue.parseColumn(column);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      if (rowspec.hasTimestamp()) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        if (split.length == 1) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>          delete.addFamily(split[0], rowspec.getTimestamp());<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        } else if (split.length == 2) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>          delete.addColumns(split[0], split[1], rowspec.getTimestamp());<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        } else {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>          return Response.status(Response.Status.BAD_REQUEST)<a name="line.385"></a>
+<span class="sourceLineNo">386</span>            .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.386"></a>
+<span class="sourceLineNo">387</span>            .build();<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      } else {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        if (split.length == 1) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          delete.addFamily(split[0]);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        } else if (split.length == 2) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          delete.addColumns(split[0], split[1]);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        } else {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>          return Response.status(Response.Status.BAD_REQUEST)<a name="line.395"></a>
+<span class="sourceLineNo">396</span>            .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.396"></a>
+<span class="sourceLineNo">397</span>            .build();<a name="line.397"></a>
+<span class="sourceLineNo">398</span>        }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      }<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    }<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    Table table = null;<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    try {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      table = servlet.getTable(tableResource.getName());<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      table.delete(delete);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>      servlet.getMetrics().incrementSucessfulDeleteRequests(1);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      if (LOG.isTraceEnabled()) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        LOG.trace("DELETE " + delete.toString());<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      }<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    } catch (Exception e) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      return processException(e);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    } finally {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      if (table != null) try {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        table.close();<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      } catch (IOException ioe) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>        LOG.debug("Exception received while closing the table", ioe);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    }<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    return Response.ok().build();<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  /**<a name="line.422"></a>
+<span class="sourceLineNo">423</span>   * Validates the input request parameters, parses columns from CellSetModel,<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   * and invokes checkAndPut on HTable.<a name="line.424"></a>
+<span class="sourceLineNo">425</span>   *<a name="line.425"></a>
+<span class="sourceLineNo">426</span>   * @param model instance of CellSetModel<a name="line.426"></a>
+<span class="sourceLineNo">427</span>   * @return Response 200 OK, 304 Not modified, 400 Bad request<a name="line.427"></a>
+<span class="sourceLineNo">428</span>   */<a name="line.428"></a>
+<span class="sourceLineNo">429</span>  Response checkAndPut(final CellSetModel model) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    Table table = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    try {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      table = servlet.getTable(tableResource.getName());<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      if (model.getRows().size() != 1) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        return Response.status(Response.Status.BAD_REQUEST).type(MIMETYPE_TEXT)<a name="line.435"></a>
+<span class="sourceLineNo">436</span>            .entity("Bad request: Number of rows specified is not 1." + CRLF).build();<a name="line.436"></a>
 <span class="sourceLineNo">437</span>      }<a name="line.437"></a>
 <span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span>      List&lt;CellModel&gt; cellModels = rowModel.getCells();<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      int cellModelCount = cellModels.size();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      if (key == null || cellModelCount &lt;= 1) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        return Response<a name="line.443"></a>
-<span class="sourceLineNo">444</span>            .status(Response.Status.BAD_REQUEST)<a name="line.444"></a>
-<span class="sourceLineNo">445</span>            .type(MIMETYPE_TEXT)<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            .entity(<a name="line.446"></a>
-<span class="sourceLineNo">447</span>              "Bad request: Either row key is null or no data found for columns specified." + CRLF)<a name="line.447"></a>
-<span class="sourceLineNo">448</span>            .build();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>      }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>      Put put = new Put(key);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      boolean retValue;<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      CellModel valueToCheckCell = cellModels.get(cellModelCount - 1);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      byte[] valueToCheckColumn = valueToCheckCell.getColumn();<a name="line.454"></a>
-<span class="sourceLineNo">455</span>      byte[][] valueToPutParts = KeyValue.parseColumn(valueToCheckColumn);<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      if (valueToPutParts.length == 2 &amp;&amp; valueToPutParts[1].length &gt; 0) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>        CellModel valueToPutCell = null;<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>        // Copy all the cells to the Put request<a name="line.459"></a>
-<span class="sourceLineNo">460</span>        // and track if the check cell's latest value is also sent<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        for (int i = 0, n = cellModelCount - 1; i &lt; n ; i++) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>          CellModel cell = cellModels.get(i);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>          byte[] col = cell.getColumn();<a name="line.463"></a>
+<span class="sourceLineNo">439</span>      RowModel rowModel = model.getRows().get(0);<a name="line.439"></a>
+<span class="sourceLineNo">440</span>      byte[] key = rowModel.getKey();<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      if (key == null) {<a name="line.441"></a>
+<span class="sourceLineNo">442</span>        key = rowspec.getRow();<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      }<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>      List&lt;CellModel&gt; cellModels = rowModel.getCells();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>      int cellModelCount = cellModels.size();<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      if (key == null || cellModelCount &lt;= 1) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        return Response<a name="line.449"></a>
+<span class="sourceLineNo">450</span>            .status(Response.Status.BAD_REQUEST)<a name="line.450"></a>
+<span class="sourceLineNo">451</span>            .type(MIMETYPE_TEXT)<a name="line.451"></a>
+<span class="sourceLineNo">452</span>            .entity(<a name="line.452"></a>
+<span class="sourceLineNo">453</span>              "Bad request: Either row key is null or no data found for columns specified." + CRLF)<a name="line.453"></a>
+<span class="sourceLineNo">454</span>            .build();<a name="line.454"></a>
+<span class="sourceLineNo">455</span>      }<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span>      Put put = new Put(key);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>      boolean retValue;<a name="line.458"></a>
+<span class="sourceLineNo">459</span>      CellModel valueToCheckCell = cellModels.get(cellModelCount - 1);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      byte[] valueToCheckColumn = valueToCheckCell.getColumn();<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      byte[][] valueToPutParts = KeyValue.parseColumn(valueToCheckColumn);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>      if (valueToPutParts.length == 2 &amp;&amp; valueToPutParts[1].length &gt; 0) {<a name="line.462"></a>
+<span class="sourceLineNo">463</span>        CellModel valueToPutCell = null;<a name="line.463"></a>
 <span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>          if (col == null) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span>            servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.467"></a>
-<span class="sourceLineNo">468</span>                    .type(MIMETYPE_TEXT).entity("Bad request: Column found to be null." + CRLF)<a name="line.468"></a>
-<span class="sourceLineNo">469</span>                    .build();<a name="line.469"></a>
-<span class="sourceLineNo">470</span>          }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>          byte [][] parts = KeyValue.parseColumn(col);<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span>          if (parts.length != 2) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.475"></a>
-<span class="sourceLineNo">476</span>                    .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.476"></a>
-<span class="sourceLineNo">477</span>                    .build();<a name="line.477"></a>
-<span class="sourceLineNo">478</span>          }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>          put.addImmutable(parts[0], parts[1], cell.getTimestamp(), cell.getValue());<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span>          if(Bytes.equals(col,<a name="line.481"></a>
-<span class="sourceLineNo">482</span>                  valueToCheckCell.getColumn())) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span>            valueToPutCell = cell;<a name="line.483"></a>
+<span class="sourceLineNo">465</span>        // Copy all the cells to the Put request<a name="line.465"></a>
+<span class="sourceLineNo">466</span>        // and track if the check cell's latest value is also sent<a name="line.466"></a>
+<span class="sourceLineNo">467</span>        for (int i = 0, n = cellModelCount - 1; i &lt; n ; i++) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span>          CellModel cell = cellModels.get(i);<a name="line.468"></a>
+<span class="sourceLineNo">469</span>          byte[] col = cell.getColumn();<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span>          if (col == null) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span>            servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.473"></a>
+<span class="sourceLineNo">474</span>                    .type(MIMETYPE_TEXT).entity("Bad request: Column found to be null." + CRLF)<a name="line.474"></a>
+<span class="sourceLineNo">475</span>                    .build();<a name="line.475"></a>
+<span class="sourceLineNo">476</span>          }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>          byte [][] parts = KeyValue.parseColumn(col);<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span>          if (parts.length != 2) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.481"></a>
+<span class="sourceLineNo">482</span>                    .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.482"></a>
+<span class="sourceLineNo">483</span>                    .build();<a name="line.483"></a>
 <span class="sourceLineNo">484</span>          }<a name="line.484"></a>
-<span class="sourceLineNo">485</span>        }<a name="line.485"></a>
+<span class="sourceLineNo">485</span>          put.addImmutable(parts[0], parts[1], cell.getTimestamp(), cell.getValue());<a name="line.485"></a>
 <span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>        if (valueToPutCell == null) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>          servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>          return Response.status(Response.Status.BAD_REQUEST).type(MIMETYPE_TEXT)<a name="line.489"></a>
-<span class="sourceLineNo">490</span>              .entity("Bad request: The column to put and check do not match." + CRLF).build();<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        } else {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>          retValue = table.checkAndPut(key, valueToPutParts[0], valueToPutParts[1],<a name="line.492"></a>
-<span class="sourceLineNo">493</span>            valueToCheckCell.getValue(), put);<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        }<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      } else {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          .type(MIMETYPE_TEXT).entity("Bad request: Column incorrectly specified." + CRLF)<a name="line.498"></a>
-<span class="sourceLineNo">499</span>          .build();<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>      if (LOG.isTraceEnabled()) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>        LOG.trace("CHECK-AND-PUT " + put.toString() + ", returns " + retValue);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      if (!retValue) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>        return Response.status(Response.Status.NOT_MODIFIED)<a name="line.507"></a>
-<span class="sourceLineNo">508</span>          .type(MIMETYPE_TEXT).entity("Value not Modified" + CRLF)<a name="line.508"></a>
-<span class="sourceLineNo">509</span>          .build();<a name="line.509"></a>
+<span class="sourceLineNo">487</span>          if(Bytes.equals(col,<a name="line.487"></a>
+<span class="sourceLineNo">488</span>                  valueToCheckCell.getColumn())) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span>            valueToPutCell = cell;<a name="line.489"></a>
+<span class="sourceLineNo">490</span>          }<a name="line.490"></a>
+<span class="sourceLineNo">491</span>        }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>        if (valueToPutCell == null) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>          servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.494"></a>
+<span class="sourceLineNo">495</span>          return Response.status(Response.Status.BAD_REQUEST).type(MIMETYPE_TEXT)<a name="line.495"></a>
+<span class="sourceLineNo">496</span>              .entity("Bad request: The column to put and check do not match." + CRLF).build();<a name="line.496"></a>
+<span class="sourceLineNo">497</span>        } else {<a name="line.497"></a>
+<span class="sourceLineNo">498</span>          retValue = table.checkAndPut(key, valueToPutParts[0], valueToPutParts[1],<a name="line.498"></a>
+<span class="sourceLineNo">499</span>            valueToCheckCell.getValue(), put);<a name="line.499"></a>
+<span class="sourceLineNo">500</span>        }<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      } else {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.503"></a>
+<span class="sourceLineNo">504</span>          .type(MIMETYPE_TEXT).entity("Bad request: Column incorrectly specified." + CRLF)<a name="line.504"></a>
+<span class="sourceLineNo">505</span>          .build();<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>      if (LOG.isTraceEnabled()) {<a name="line.508"></a>
+<span class="sourceLineNo">509</span>        LOG.trace("CHECK-AND-PUT " + put.toString() + ", returns " + retValue);<a name="line.509"></a>
 <span class="sourceLineNo">510</span>      }<a name="line.510"></a>
-<span class="sourceLineNo">511</span>      ResponseBuilder response = Response.ok();<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      servlet.getMetrics().incrementSucessfulPutRequests(1);<a name="line.512"></a>
-<span class="sourceLineNo">513</span>      return response.build();<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    } catch (Exception e) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      return processException(e);<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    } finally {<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      if (table != null) try {<a name="line.518"></a>
-<span class="sourceLineNo">519</span>        table.close();<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      } catch (IOException ioe) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span>        LOG.debug("Exception received while closing the table", ioe);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>      }<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    }<a name="line.523"></a>
-<span class="sourceLineNo">524</span>  }<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>  /**<a name="line.526"></a>
-<span class="sourceLineNo">527</span>   * Validates the input request parameters, parses columns from CellSetModel,<a name="line.527"></a>
-<span class="sourceLineNo">528</span>   * and invokes checkAndDelete on HTable.<a name="line.528"></a>
-<span class="sourceLineNo">529</span>   *<a name="line.529"></a>
-<span class="sourceLineNo">530</span>   * @param model instance of CellSetModel<a name="line.530"></a>
-<span class="sourceLineNo">531</span>   * @return Response 200 OK, 304 Not modified, 400 Bad request<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   */<a name="line.532"></a>
-<span class="sourceLineNo">533</span>  Response checkAndDelete(final CellSetModel model) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    Table table = null;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    Delete delete = null;<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    try {<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      table = servlet.getTable(tableResource.getName());<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      if (model.getRows().size() != 1) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>        servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.540"></a>
-<span class="sourceLineNo">541</span>          .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.541"></a>
-<span class="sourceLineNo">542</span>          .build();<a name="line.542"></a>
-<span class="sourceLineNo">543</span>      }<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      RowModel rowModel = model.getRows().get(0);<a name="line.544"></a>
-<span class="sourceLineNo">545</span>      byte[] key = rowModel.getKey();<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      if (key == null) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span>        key = rowspec.getRow();<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      }<a name="line.548"></a>
-<span class="sourceLineNo">549</span>      if (key == null) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>        servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.550"></a>
-<span class="sourceLineNo">551</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.551"></a>
-<span class="sourceLineNo">552</span>          .type(MIMETYPE_TEXT).entity("Bad request: Row key found to be null." + CRLF)<a name="line.552"></a>
-<span class="sourceLineNo">553</span>          .build();<a name="line.553"></a>
+<span class="sourceLineNo">511</span>      if (!retValue) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.512"></a>
+<span class="sourceLineNo">513</span>        return Response.status(Response.Status.NOT_MODIFIED)<a name="line.513"></a>
+<span class="sourceLineNo">514</span>          .type(MIMETYPE_TEXT).entity("Value not Modified" + CRLF)<a name="line.514"></a>
+<span class="sourceLineNo">515</span>          .build();<a name="line.515"></a>
+<span class="sourceLineNo">516</span>      }<a name="line.516"></a>
+<span class="sourceLineNo">517</span>      ResponseBuilder response = Response.ok();<a name="line.517"></a>
+<span class="sourceLineNo">518</span>      servlet.getMetrics().incrementSucessfulPutRequests(1);<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      return response.build();<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    } catch (Exception e) {<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      return processException(e);<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    } finally {<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      if (table != null) try {<a name="line.524"></a>
+<span class="sourceLineNo">525</span>        table.close();<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      } catch (IOException ioe) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>        LOG.debug("Exception received while closing the table", ioe);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>  }<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span>  /**<a name="line.532"></a>
+<span class="sourceLineNo">533</span>   * Validates the input request parameters, parses columns from CellSetModel,<a name="line.533"></a>
+<span class="sourceLineNo">534</span>   * and invokes checkAndDelete on HTable.<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   *<a name="line.535"></a>
+<span class="sourceLineNo">536</span>   * @param model instance of CellSetModel<a name="line.536"></a>
+<span class="sourceLineNo">537</span>   * @return Response 200 OK, 304 Not modified, 400 Bad request<a name="line.537"></a>
+<span class="sourceLineNo">538</span>   */<a name="line.538"></a>
+<span class="sourceLineNo">539</span>  Response checkAndDelete(final CellSetModel model) {<a name="line.539"></a>
+<span class="sourceLineNo">540</span>    Table table = null;<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    Delete delete = null;<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    try {<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      table = servlet.getTable(tableResource.getName());<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      if (model.getRows().size() != 1) {<a name="line.544"></a>
+<span class="sourceLineNo">545</span>        servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.545"></a>
+<span class="sourceLineNo">546</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.546"></a>
+<span class="sourceLineNo">547</span>          .type(MIMETYPE_TEXT).entity("Bad request" + CRLF)<a name="line.547"></a>
+<span class="sourceLineNo">548</span>          .build();<a name="line.548"></a>
+<span class="sourceLineNo">549</span>      }<a name="line.549"></a>
+<span class="sourceLineNo">550</span>      RowModel rowModel = model.getRows().get(0);<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      byte[] key = rowModel.getKey();<a name="line.551"></a>
+<span class="sourceLineNo">552</span>      if (key == null) {<a name="line.552"></a>
+<span class="sourceLineNo">553</span>        key = rowspec.getRow();<a name="line.553"></a>
 <span class="sourceLineNo">554</span>      }<a name="line.554"></a>
-<span class="sourceLineNo">555</span><a name="line.555"></a>
-<span class="sourceLineNo">556</span>      List&lt;CellModel&gt; cellModels = rowModel.getCells();<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      int cellModelCount = cellModels.size();<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span>      delete = new Delete(key);<a name="line.559"></a>
-<span class="sourceLineNo">560</span>      boolean retValue;<a name="line.560"></a>
-<span class="sourceLineNo">561</span>      CellModel valueToDeleteCell = rowModel.getCells().get(cellModelCount -1);<a name="line.561"></a>
-<span class="sourceLineNo">562</span>      byte[] valueToDeleteColumn = valueToDeleteCell.getColumn();<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      if (valueToDeleteColumn == null) {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>        try {<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          valueToDeleteColumn = rowspec.getColumns()[0];<a name="line.565"></a>
-<span class="sourceLineNo">566</span>        } catch (final ArrayIndexOutOfBoundsException e) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>          servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.567"></a>
-<span class="sourceLineNo">568</span>          return Response.status(Response.Status.BAD_REQUEST)<a name="line.568"></a>
-<span class="sourceLineNo">569</span>            .type(MIMETYPE_TEXT).entity("Bad request: Column not specified for check." + CRLF)<a name="line.569"></a>
-<span class="sourceLineNo">570</span>            .build();<a name="line.570"></a>
-<span class="sourceLineNo">571</span>        }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      }<a name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span>      byte[][] parts ;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      // Copy all the cells to the Delete request if extra cells are sent<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      if(cellModelCount &gt; 1) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>        for (int i = 0, n = cellModelCount - 1; i &lt; n; i++) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>          CellModel cell = cellModels.get(i);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>          byte[] col = cell.getColumn();<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span>          if (col == null) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>            servlet.getMetrics().incrementFailedPutRequests(1);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.583"></a>
-<span class="sourceLineNo">584</span>                    .type(MIMETYPE_TEXT).entity("Bad request: Column found to be null." + CRLF)<a name="line.584"></a>
-<span class="sourceLineNo">585</span>                    .build();<a name="line.585"></a>
-<span class="sourceLineNo">586</span>          }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>          parts = KeyValue.parseColumn(col);<a name="line.588"></a>
-<span class="sourceLineNo">589</span><a name="line.589"></a>
-<span class="sourceLineNo">590</span>          if (parts.length == 1) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>            // Only Column Family is specified<a name="line.591"></a>
-<span class="sourceLineNo">592</span>            delete.addFamily(parts[0], cell.getTimestamp());<a name="line.592"></a>
-<span class="sourceLineNo">593</span>          } else if (parts.length == 2) {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>            delete.addColumn(parts[0], parts[1], cell.getTimestamp());<a name="line.594"></a>
-<span class="sourceLineNo">595</span>          } else {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>            servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>            return Response.status(Response.Status.BAD_REQUEST)<a name="line.597"></a>
-<span class="sourceLineNo">598</span>                    .type(MIMETYPE_TEXT)<a name="line.598"></a>
-<span class="sourceLineNo">599</span>                    .entity("Bad request: Column to delete incorrectly specified." + CRLF)<a name="line.599"></a>
-<span class="sourceLineNo">600</span>                    .build();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>          }<a name="line.601"></a>
-<span class="sourceLineNo">602</span>        }<a name="line.602"></a>
-<span class="sourceLineNo">603</span>      }<a name="line.603"></a>
-<span class="sourceLineNo">604</span><a name="line.604"></a>
-<span class="sourceLineNo">605</span>      parts = KeyValue.parseColumn(valueToDeleteColumn);<a name="line.605"></a>
-<span class="sourceLineNo">606</span>      if (parts.length == 2) {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>        if (parts[1].length != 0) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>          // To support backcompat of deleting a cell<a name="line.608"></a>
-<span class="sourceLineNo">609</span>          // if that is the only cell passed to the rest api<a name="line.609"></a>
-<span class="sourceLineNo">610</span>          if(cellModelCount == 1) {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>            delete.addColumns(parts[0], parts[1]);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>          }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>          retValue = table.checkAndDelete(key, parts[0], parts[1],<a name="line.613"></a>
-<span class="sourceLineNo">614</span>            valueToDeleteCell.getValue(), delete);<a name="line.614"></a>
-<span class="sourceLineNo">615</span>        } else {<a name="line.615"></a>
-<span class="sourceLineNo">616</span>          // The case of empty qualifier.<a name="line.616"></a>
-<span class="sourceLineNo">617</span>          if(cellModelCount == 1) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>            delete.addColumns(parts[0], Bytes.toBytes(StringUtils.EMPTY));<a name="line.618"></a>
-<span class="sourceLineNo">619</span>          }<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          retValue = table.checkAndDelete(key, parts[0], Bytes.toBytes(StringUtils.EMPTY),<a name="line.620"></a>
-<span class="sourceLineNo">621</span>            valueToDeleteCell.getValue(), delete);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>        }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      } else {<a name="line.623"></a>
-<span class="sourceLineNo">624</span>        servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        return Response.status(Response.Status.BAD_REQUEST)<a name="line.625"></a>
-<span class="sourceLineNo">626</span>          .type(MIMETYPE_TEXT).entity("Bad request: Column to check incorrectly specified." + CRLF)<a name="line.626"></a>
-<span class="sourceLineNo">627</span>          .build();<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span>      if (LOG.isTraceEnabled()) {<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        LOG.trace("CHECK-AND-DELETE " + delete.toString() + ", returns "<a name="line.631"></a>
-<span class="sourceLineNo">632</span>          + retValue);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      }<a name="line.633"></a>
-<span class="sourceLineNo">634</span><a name="line.634"></a>
-<span class="sourceLineNo">635</span>      if (!retValue) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        servlet.getMetrics().incrementFailedDeleteRequests(1);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>        return Response.status(Response.Status.NOT_MODIFIED)<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            .type(MIMETYPE_TEXT).entity(" Delete check failed." + CRLF)<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            .build();<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      }<a name="line.640"></a>
-<span class="sourceLineNo">641</span>      ResponseBuilder response = Response.ok();<a name="line.641"></a>
-<span class="sourceLineNo">642</span>      servlet.getMetrics().incrementSucessfulDeleteRequests(1);<a name="line.642">

<TRUNCATED>

Mime
View raw message