Skip to content

Commit 3b0c276

Browse files
authored
HBASE-23329 Remove unused methods from RequestConverter (#870)
Signed-off-by: Sean Busbey <busbey@apache.org>
1 parent 54ad797 commit 3b0c276

File tree

1 file changed

+0
-186
lines changed

1 file changed

+0
-186
lines changed

hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java

Lines changed: 0 additions & 186 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.hadoop.hbase.client.Append;
4040
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
4141
import org.apache.hadoop.hbase.client.Delete;
42-
import org.apache.hadoop.hbase.client.Durability;
4342
import org.apache.hadoop.hbase.client.Get;
4443
import org.apache.hadoop.hbase.client.Increment;
4544
import org.apache.hadoop.hbase.client.MasterSwitchType;
@@ -87,8 +86,6 @@
8786
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiRequest;
8887
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutateRequest;
8988
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto;
90-
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.ColumnValue;
91-
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue;
9289
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType;
9390
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.RegionAction;
9491
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest;
@@ -112,10 +109,8 @@
112109
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableRequest;
113110
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetClusterStatusRequest;
114111
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest;
115-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest;
116112
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest;
117113
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableNamesRequest;
118-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableStateRequest;
119114
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsBalancerEnabledRequest;
120115
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest;
121116
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsCleanerChoreEnabledRequest;
@@ -187,48 +182,6 @@ public static GetRequest buildGetRequest(final byte[] regionName,
187182
return builder.build();
188183
}
189184

190-
/**
191-
* Create a protocol buffer MutateRequest for a client increment
192-
*
193-
* @param regionName
194-
* @param row
195-
* @param family
196-
* @param qualifier
197-
* @param amount
198-
* @param durability
199-
* @return a mutate request
200-
*/
201-
public static MutateRequest buildIncrementRequest(
202-
final byte[] regionName, final byte[] row, final byte[] family, final byte[] qualifier,
203-
final long amount, final Durability durability, long nonceGroup, long nonce) {
204-
MutateRequest.Builder builder = MutateRequest.newBuilder();
205-
RegionSpecifier region = buildRegionSpecifier(
206-
RegionSpecifierType.REGION_NAME, regionName);
207-
builder.setRegion(region);
208-
209-
MutationProto.Builder mutateBuilder = MutationProto.newBuilder();
210-
mutateBuilder.setRow(UnsafeByteOperations.unsafeWrap(row));
211-
mutateBuilder.setMutateType(MutationType.INCREMENT);
212-
mutateBuilder.setDurability(ProtobufUtil.toDurability(durability));
213-
ColumnValue.Builder columnBuilder = ColumnValue.newBuilder();
214-
columnBuilder.setFamily(UnsafeByteOperations.unsafeWrap(family));
215-
QualifierValue.Builder valueBuilder = QualifierValue.newBuilder();
216-
valueBuilder.setValue(UnsafeByteOperations.unsafeWrap(Bytes.toBytes(amount)));
217-
valueBuilder.setQualifier(UnsafeByteOperations
218-
.unsafeWrap(qualifier == null ? HConstants.EMPTY_BYTE_ARRAY : qualifier));
219-
valueBuilder.setTimestamp(HConstants.LATEST_TIMESTAMP);
220-
columnBuilder.addQualifierValue(valueBuilder.build());
221-
mutateBuilder.addColumnValue(columnBuilder.build());
222-
if (nonce != HConstants.NO_NONCE) {
223-
mutateBuilder.setNonce(nonce);
224-
}
225-
builder.setMutation(mutateBuilder.build());
226-
if (nonceGroup != HConstants.NO_NONCE) {
227-
builder.setNonceGroup(nonceGroup);
228-
}
229-
return builder.build();
230-
}
231-
232185
/**
233186
* Create a protocol buffer MutateRequest for a conditioned put
234187
*
@@ -553,24 +506,6 @@ public static ScanRequest buildScanRequest(long scannerId, int numberOfRows, boo
553506
return builder.build();
554507
}
555508

556-
/**
557-
* Create a protocol buffer bulk load request
558-
*
559-
* @param familyPaths
560-
* @param regionName
561-
* @param assignSeqNum
562-
* @param userToken
563-
* @param bulkToken
564-
* @return a bulk load request
565-
*/
566-
public static BulkLoadHFileRequest buildBulkLoadHFileRequest(
567-
final List<Pair<byte[], String>> familyPaths,
568-
final byte[] regionName, boolean assignSeqNum,
569-
final Token<?> userToken, final String bulkToken) {
570-
return buildBulkLoadHFileRequest(familyPaths, regionName, assignSeqNum, userToken, bulkToken,
571-
false, null, true);
572-
}
573-
574509
/**
575510
* Create a protocol buffer bulk load request
576511
*
@@ -630,101 +565,6 @@ public static BulkLoadHFileRequest buildBulkLoadHFileRequest(
630565
return request.build();
631566
}
632567

633-
/**
634-
* Create a protocol buffer multi request for a list of actions. Propagates Actions original
635-
* index. The passed in multiRequestBuilder will be populated with region actions.
636-
* @param regionName The region name of the actions.
637-
* @param actions The actions that are grouped by the same region name.
638-
* @param multiRequestBuilder The multiRequestBuilder to be populated with region actions.
639-
* @param regionActionBuilder regionActionBuilder to be used to build region action.
640-
* @param actionBuilder actionBuilder to be used to build action.
641-
* @param mutationBuilder mutationBuilder to be used to build mutation.
642-
* @param nonceGroup nonceGroup to be applied.
643-
* @param rowMutationsIndexMap Map of created RegionAction to the original index for a
644-
* RowMutations within the original list of actions
645-
* @throws IOException
646-
*/
647-
public static void buildRegionActions(final byte[] regionName,
648-
final List<Action> actions, final MultiRequest.Builder multiRequestBuilder,
649-
final RegionAction.Builder regionActionBuilder,
650-
final ClientProtos.Action.Builder actionBuilder,
651-
final MutationProto.Builder mutationBuilder,
652-
long nonceGroup, final Map<Integer, Integer> rowMutationsIndexMap) throws IOException {
653-
regionActionBuilder.clear();
654-
RegionAction.Builder builder = getRegionActionBuilderWithRegion(
655-
regionActionBuilder, regionName);
656-
ClientProtos.CoprocessorServiceCall.Builder cpBuilder = null;
657-
boolean hasNonce = false;
658-
List<Action> rowMutationsList = new ArrayList<>();
659-
660-
for (Action action: actions) {
661-
Row row = action.getAction();
662-
actionBuilder.clear();
663-
actionBuilder.setIndex(action.getOriginalIndex());
664-
mutationBuilder.clear();
665-
if (row instanceof Get) {
666-
Get g = (Get)row;
667-
builder.addAction(actionBuilder.setGet(ProtobufUtil.toGet(g)));
668-
} else if (row instanceof Put) {
669-
builder.addAction(actionBuilder.
670-
setMutation(ProtobufUtil.toMutation(MutationType.PUT, (Put)row, mutationBuilder)));
671-
} else if (row instanceof Delete) {
672-
builder.addAction(actionBuilder.
673-
setMutation(ProtobufUtil.toMutation(MutationType.DELETE, (Delete)row, mutationBuilder)));
674-
} else if (row instanceof Append) {
675-
builder.addAction(actionBuilder.setMutation(ProtobufUtil.toMutation(
676-
MutationType.APPEND, (Append)row, mutationBuilder, action.getNonce())));
677-
hasNonce = true;
678-
} else if (row instanceof Increment) {
679-
builder.addAction(actionBuilder.setMutation(ProtobufUtil.toMutation(
680-
MutationType.INCREMENT, (Increment)row, mutationBuilder, action.getNonce())));
681-
hasNonce = true;
682-
} else if (row instanceof RegionCoprocessorServiceExec) {
683-
RegionCoprocessorServiceExec exec = (RegionCoprocessorServiceExec) row;
684-
// DUMB COPY!!! FIX!!! Done to copy from c.g.p.ByteString to shaded ByteString.
685-
org.apache.hbase.thirdparty.com.google.protobuf.ByteString value =
686-
org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations.unsafeWrap(
687-
exec.getRequest().toByteArray());
688-
if (cpBuilder == null) {
689-
cpBuilder = ClientProtos.CoprocessorServiceCall.newBuilder();
690-
} else {
691-
cpBuilder.clear();
692-
}
693-
builder.addAction(actionBuilder.setServiceCall(
694-
cpBuilder.setRow(UnsafeByteOperations.unsafeWrap(exec.getRow()))
695-
.setServiceName(exec.getMethod().getService().getFullName())
696-
.setMethodName(exec.getMethod().getName())
697-
.setRequest(value)));
698-
} else if (row instanceof RowMutations) {
699-
rowMutationsList.add(action);
700-
} else {
701-
throw new DoNotRetryIOException("Multi doesn't support " + row.getClass().getName());
702-
}
703-
}
704-
if (!multiRequestBuilder.hasNonceGroup() && hasNonce) {
705-
multiRequestBuilder.setNonceGroup(nonceGroup);
706-
}
707-
multiRequestBuilder.addRegionAction(builder.build());
708-
709-
// Process RowMutations here. We can not process it in the big loop above because
710-
// it will corrupt the sequence order maintained in cells.
711-
// RowMutations is a set of Puts and/or Deletes all to be applied atomically
712-
// on the one row. We do separate RegionAction for each RowMutations.
713-
// We maintain a map to keep track of this RegionAction and the original Action index.
714-
for (Action action : rowMutationsList) {
715-
RowMutations rms = (RowMutations) action.getAction();
716-
RegionAction.Builder rowMutationsRegionActionBuilder =
717-
RequestConverter.buildRegionAction(regionName, rms);
718-
rowMutationsRegionActionBuilder.setAtomic(true);
719-
// Put it in the multiRequestBuilder
720-
multiRequestBuilder.addRegionAction(rowMutationsRegionActionBuilder.build());
721-
// This rowMutations region action is at (multiRequestBuilder.getRegionActionCount() - 1)
722-
// in the overall multiRequest.
723-
rowMutationsIndexMap.put(multiRequestBuilder.getRegionActionCount() - 1,
724-
action.getOriginalIndex());
725-
}
726-
}
727-
728568
/**
729569
* Create a protocol buffer multirequest with NO data for a list of actions (data is carried
730570
* otherwise than via protobuf). This means it just notes attributes, whether to write the
@@ -1357,19 +1197,6 @@ public static ModifyTableRequest buildModifyTableRequest(
13571197
return builder.build();
13581198
}
13591199

1360-
/**
1361-
* Creates a protocol buffer GetSchemaAlterStatusRequest
1362-
*
1363-
* @param tableName
1364-
* @return a GetSchemaAlterStatusRequest
1365-
*/
1366-
public static GetSchemaAlterStatusRequest buildGetSchemaAlterStatusRequest(
1367-
final TableName tableName) {
1368-
GetSchemaAlterStatusRequest.Builder builder = GetSchemaAlterStatusRequest.newBuilder();
1369-
builder.setTableName(ProtobufUtil.toProtoTableName((tableName)));
1370-
return builder.build();
1371-
}
1372-
13731200
/**
13741201
* Creates a protocol buffer GetTableDescriptorsRequest
13751202
*
@@ -1421,19 +1248,6 @@ public static GetTableNamesRequest buildGetTableNamesRequest(final Pattern patte
14211248
return builder.build();
14221249
}
14231250

1424-
/**
1425-
* Creates a protocol buffer GetTableStateRequest
1426-
*
1427-
* @param tableName table to get request for
1428-
* @return a GetTableStateRequest
1429-
*/
1430-
public static GetTableStateRequest buildGetTableStateRequest(
1431-
final TableName tableName) {
1432-
return GetTableStateRequest.newBuilder()
1433-
.setTableName(ProtobufUtil.toProtoTableName(tableName))
1434-
.build();
1435-
}
1436-
14371251
/**
14381252
* Creates a protocol buffer SetTableStateInMetaRequest
14391253
* @param state table state to update in Meta

0 commit comments

Comments
 (0)