cshannon commented on code in PR #3957:
URL: https://github.com/apache/accumulo/pull/3957#discussion_r1398253740
##########
server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java:
##########
@@ -1236,24 +1290,42 @@ private boolean isTabletAssigned(Key key) {
|| key.getColumnFamily().equals(FutureLocationColumnFamily.NAME);
}
- private KeyExtent getHighTablet(KeyExtent range) throws AccumuloException {
+ private HighTablet getHighTablet(KeyExtent range) throws AccumuloException {
try {
AccumuloClient client = manager.getContext();
Scanner scanner = client.createScanner(range.isMeta() ? RootTable.NAME :
MetadataTable.NAME,
Authorizations.EMPTY);
TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
+ MergedColumnFamily.MERGED_COLUMN.fetch(scanner);
KeyExtent start = new KeyExtent(range.tableId(), range.endRow(), null);
scanner.setRange(new Range(start.toMetaRow(), null));
Iterator<Entry<Key,Value>> iterator = scanner.iterator();
if (!iterator.hasNext()) {
throw new AccumuloException("No last tablet for a merge " + range);
}
- Entry<Key,Value> entry = iterator.next();
- KeyExtent highTablet = KeyExtent.fromMetaPrevRow(entry);
- if (!highTablet.tableId().equals(range.tableId())) {
+
+ KeyExtent highTablet = null;
+ boolean isMerged = false;
+ Value hasPrevRowColumn = null;
+
+ while (iterator.hasNext()) {
Review Comment:
I added a check to verify the columns are all seen from the same first row
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
