Skip to content

HBASE-30007 Multiget with timestamp incorrectly returns 404 not found #7956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dParikesit wants to merge 1 commit into
base: master
Choose a base branch
from
+79 −1
Open

HBASE-30007 Multiget with timestamp incorrectly returns 404 not found #7956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResultReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ public MultiRowResultReader(final String tableName, final Collection<RowSpec> ro
}
}
}
get.setTimeRange(rowspec.getStartTime(), rowspec.getEndTime());
if (rowspec.isPartialTimeRange()) {
get.setTimestamp(rowspec.getTimestamp());
} else {
get.setTimeRange(rowspec.getStartTime(), rowspec.getEndTime());
}
get.readVersions(rowspec.getMaxVersions());
if (filter != null) {
get.setFilter(filter);
Expand Down
74 changes: 74 additions & 0 deletions hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/MultiRowResourceTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ public class MultiRowResourceTestBase {
private static final String VALUE_1 = "testvalue5";
private static final String ROW_2 = "testrow6";
private static final String VALUE_2 = "testvalue6";
private static final String TIMESTAMPED_ROW_1 = "testrow7";
private static final String TIMESTAMPED_ROW_2 = "testrow8";
private static final String TIMESTAMPED_OLD_VALUE_1 = "testvalue7-old";
private static final String TIMESTAMPED_NEW_VALUE_1 = "testvalue7-new";
private static final String TIMESTAMPED_OLD_VALUE_2 = "testvalue8-old";
private static final String TIMESTAMPED_NEW_VALUE_2 = "testvalue8-new";
private static final long TIMESTAMP_1 = 1000L;
private static final long TIMESTAMP_2 = 2000L;

private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL = new HBaseRESTTestingUtility();
Expand Down Expand Up @@ -198,6 +206,72 @@ public void testMultiCellGetJSONB64() throws IOException {
client.delete(row_6_url, extraHdr);
}

private void postBinaryWithTimestamp(String path, String value, long timestamp)
throws IOException {
Header[] headers = new Header[] { new BasicHeader("Content-Type", Constants.MIMETYPE_BINARY),
new BasicHeader("X-Timestamp", Long.toString(timestamp)), extraHdr };
Response response = client.post(path, headers, Bytes.toBytes(value));
assertEquals(200, response.getCode());
}

@Test
public void testMultiCellGetWithExactTimestampJSON() throws IOException {
String row_7_url = "/" + TABLE + "/" + TIMESTAMPED_ROW_1 + "/" + COLUMN_1;
String row_8_url = "/" + TABLE + "/" + TIMESTAMPED_ROW_2 + "/" + COLUMN_2;
String row_7_delete_url = "/" + TABLE + "/" + TIMESTAMPED_ROW_1;
String row_8_delete_url = "/" + TABLE + "/" + TIMESTAMPED_ROW_2;

postBinaryWithTimestamp(row_7_url, TIMESTAMPED_OLD_VALUE_1, TIMESTAMP_1);
postBinaryWithTimestamp(row_7_url, TIMESTAMPED_NEW_VALUE_1, TIMESTAMP_2);
postBinaryWithTimestamp(row_8_url, TIMESTAMPED_OLD_VALUE_2, TIMESTAMP_1);
postBinaryWithTimestamp(row_8_url, TIMESTAMPED_NEW_VALUE_2, TIMESTAMP_2);

try {
StringBuilder path = new StringBuilder();
path.append("/");
path.append(TABLE);
path.append("/multiget/?row=");
path.append(TIMESTAMPED_ROW_1);
path.append("/");
path.append("/");
path.append(TIMESTAMP_1);
path.append("&row=");
path.append(TIMESTAMPED_ROW_2);
path.append("/");
path.append("/");
path.append(TIMESTAMP_1);

Response response = client.get(path.toString(), Constants.MIMETYPE_JSON);
assertEquals(200, response.getCode());
assertEquals(Constants.MIMETYPE_JSON, response.getHeader("content-type"));

ObjectMapper mapper = new JacksonJaxbJsonProvider().locateMapper(CellSetModel.class,
MediaType.APPLICATION_JSON_TYPE);
CellSetModel cellSet = mapper.readValue(response.getBody(), CellSetModel.class);

assertEquals(2, cellSet.getRows().size());

RowModel rowModel = cellSet.getRows().get(0);
assertEquals(TIMESTAMPED_ROW_1, Bytes.toString(rowModel.getKey()));
assertEquals(1, rowModel.getCells().size());
CellModel cell = rowModel.getCells().get(0);
assertEquals(COLUMN_1, Bytes.toString(cell.getColumn()));
assertEquals(TIMESTAMPED_OLD_VALUE_1, Bytes.toString(cell.getValue()));
assertEquals(TIMESTAMP_1, cell.getTimestamp());

rowModel = cellSet.getRows().get(1);
assertEquals(TIMESTAMPED_ROW_2, Bytes.toString(rowModel.getKey()));
assertEquals(1, rowModel.getCells().size());
cell = rowModel.getCells().get(0);
assertEquals(COLUMN_2, Bytes.toString(cell.getColumn()));
assertEquals(TIMESTAMPED_OLD_VALUE_2, Bytes.toString(cell.getValue()));
assertEquals(TIMESTAMP_1, cell.getTimestamp());
} finally {
client.delete(row_7_delete_url, extraHdr);
client.delete(row_8_delete_url, extraHdr);
}
}

@Test
public void testMultiCellGetNoKeys() throws IOException {
StringBuilder path = new StringBuilder();
Expand Down