HBASE-23969 Meta browser should show all info columns
#1485
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ | |
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Iterator; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
|
|
@@ -384,32 +385,42 @@ public static List<RegionInfo> getMergeRegions(Connection connection, byte[] reg | |
| } | ||
|
|
||
| /** | ||
| * @return Deserialized values of <qualifier,regioninfo> pairs taken from column values that match | ||
| * the regex 'info:merge.*' in array of <code>cells</code>. | ||
| */ | ||
| @Nullable | ||
| public static Map<String, RegionInfo> getMergeRegionsWithName(Cell [] cells) { | ||
| if (cells == null) { | ||
| return null; | ||
| } | ||
| Map<String, RegionInfo> regionsToMerge = null; | ||
| for (Cell cell: cells) { | ||
| if (!isMergeQualifierPrefix(cell)) { | ||
| continue; | ||
| } | ||
| // Ok. This cell is that of a info:merge* column. | ||
| RegionInfo ri = RegionInfo.parseFromOrNull(cell.getValueArray(), cell.getValueOffset(), | ||
| cell.getValueLength()); | ||
| if (ri != null) { | ||
| if (regionsToMerge == null) { | ||
| regionsToMerge = new LinkedHashMap<>(); | ||
| } | ||
| regionsToMerge.put(Bytes.toString(CellUtil.cloneQualifier(cell)), ri); | ||
| } | ||
| } | ||
| return regionsToMerge; | ||
| } | ||
|
|
||
| /** | ||
| * @return Deserialized regioninfo values taken from column values that match | ||
| * the regex 'info:merge.*' in array of <code>cells</code>. | ||
| */ | ||
| @Nullable | ||
| public static List<RegionInfo> getMergeRegions(Cell [] cells) { | ||
| Map<String, RegionInfo> mergeRegionsWithName = getMergeRegionsWithName(cells); | ||
| return (mergeRegionsWithName == null) ? null : new ArrayList<>(mergeRegionsWithName.values()); | ||
| } | ||
|
|
||
| /** | ||
| * @return True if any merge regions present in <code>cells</code>; i.e. | ||
| * the column in <code>cell</code> matches the regex 'info:merge.*'. | ||
|
|
@@ -873,8 +884,7 @@ static byte[] getRegionStateColumn(int replicaId) { | |
| * @param replicaId the replicaId of the region | ||
| * @return a byte[] for sn column qualifier | ||
| */ | ||
| public static byte[] getServerNameColumn(int replicaId) { | ||
| return replicaId == 0 ? HConstants.SERVERNAME_QUALIFIER | ||
| : Bytes.toBytes(HConstants.SERVERNAME_QUALIFIER_STR + META_REPLICA_ID_DELIMITER | ||
| + String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId)); | ||
|
|
@@ -966,6 +976,33 @@ public static ServerName getServerName(final Result r, final int replicaId) { | |
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the {@link ServerName} from catalog table {@link Result} where the region is | ||
| * transitioning on. It should be the same as {@link MetaTableAccessor#getServerName(Result,int)} | ||
| * if the server is at OPEN state. | ||
| * | ||
| * @param r Result to pull the transitioning server name from | ||
| * @return A ServerName instance or {@link MetaTableAccessor#getServerName(Result,int)} | ||
| * if necessary fields not found or empty. | ||
| */ | ||
| @Nullable | ||
| public static ServerName getTargetServerName(final Result r, final int replicaId) { | ||
|
There was a problem hiding this comment. What is rationale for moving this method? How is it MetaTableAccessor material? There was a problem hiding this comment. .. and not private to RegoinStateStore where it was originally? There was a problem hiding this comment. @saintstack This method is used so far by both This also came from my coding experience. When I write the first patch, I implemented my version in MetaTableAccessor instead of calling the implementation in RegoinStateStore. I simply did not know existing logic is already someplace there. Meanwhile, both There was a problem hiding this comment. Long-stale conversation, perhaps... I agree with @liuml07 on this one -- it's a good thing to have a centralized place for encapsulating the serialization details of storing and retrieving content from meta. |
||
| final Cell cell = r.getColumnLatestCell(HConstants.CATALOG_FAMILY, | ||
| getServerNameColumn(replicaId)); | ||
| if (cell == null || cell.getValueLength() == 0) { | ||
| RegionLocations locations = MetaTableAccessor.getRegionLocations(r); | ||
| if (locations != null) { | ||
| HRegionLocation location = locations.getRegionLocation(replicaId); | ||
| if (location != null) { | ||
| return location.getServerName(); | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| return ServerName.parseServerName(Bytes.toString(cell.getValueArray(), cell.getValueOffset(), | ||
| cell.getValueLength())); | ||
| } | ||
|
|
||
| /** | ||
| * The latest seqnum that the server writing to meta observed when opening the region. | ||
| * E.g. the seqNum when the result of {@link #getServerName(Result, int)} was written. | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unused import.