Skip to content

Commit 836f2d9

Browse files
Apache9Apache9
authored
HBASE-28719 Use ExtendedCell in WALEdit (#6108)
Signed-off-by: Xin Sun <sunxin@apache.org>
1 parent 8c2e5f3 commit 836f2d9

File tree

44 files changed

+305
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+305
-158
lines changed

‎hbase-client/src/main/java/org/apache/hadoop/hbase/client/PackagePrivateFieldAccessor.java renamed to ‎hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientInternalHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* TODO: A better solution is to separate the data structures used in client and server.
3333
*/
3434
@InterfaceAudience.Private
35-
public class PackagePrivateFieldAccessor {
35+
public class ClientInternalHelper {
3636

3737
public static void setMvccReadPoint(Scan scan, long mvccReadPoint) {
3838
scan.setMvccReadPoint(mvccReadPoint);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
import org.apache.hadoop.hbase.client.BalancerDecision;
7777
import org.apache.hadoop.hbase.client.BalancerRejection;
7878
import org.apache.hadoop.hbase.client.CheckAndMutate;
79+
import org.apache.hadoop.hbase.client.ClientInternalHelper;
7980
import org.apache.hadoop.hbase.client.ClientUtil;
8081
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
8182
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -89,7 +90,6 @@
8990
import org.apache.hadoop.hbase.client.LogEntry;
9091
import org.apache.hadoop.hbase.client.Mutation;
9192
import org.apache.hadoop.hbase.client.OnlineLogRecord;
92-
import org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor;
9393
import org.apache.hadoop.hbase.client.Put;
9494
import org.apache.hadoop.hbase.client.RegionInfoBuilder;
9595
import org.apache.hadoop.hbase.client.RegionLoadStats;
@@ -1082,7 +1082,7 @@ public static ClientProtos.Scan toScan(final Scan scan) throws IOException {
10821082
if (scan.getCaching() > 0) {
10831083
scanBuilder.setCaching(scan.getCaching());
10841084
}
1085-
long mvccReadPoint = PackagePrivateFieldAccessor.getMvccReadPoint(scan);
1085+
long mvccReadPoint = ClientInternalHelper.getMvccReadPoint(scan);
10861086
if (mvccReadPoint > 0) {
10871087
scanBuilder.setMvccReadPoint(mvccReadPoint);
10881088
}
@@ -1192,7 +1192,7 @@ public static Scan toScan(final ClientProtos.Scan proto) throws IOException {
11921192
scan.setCaching(proto.getCaching());
11931193
}
11941194
if (proto.hasMvccReadPoint()) {
1195-
PackagePrivateFieldAccessor.setMvccReadPoint(scan, proto.getMvccReadPoint());
1195+
ClientInternalHelper.setMvccReadPoint(scan, proto.getMvccReadPoint());
11961196
}
11971197
if (proto.hasReadType()) {
11981198
scan.setReadType(toReadType(proto.getReadType()));

‎hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@
4747
import org.apache.hadoop.hbase.Tag;
4848
import org.apache.hadoop.hbase.ZooKeeperConnectionException;
4949
import org.apache.hadoop.hbase.client.Admin;
50+
import org.apache.hadoop.hbase.client.ClientInternalHelper;
5051
import org.apache.hadoop.hbase.client.Connection;
5152
import org.apache.hadoop.hbase.client.ConnectionFactory;
5253
import org.apache.hadoop.hbase.client.Delete;
5354
import org.apache.hadoop.hbase.client.Durability;
5455
import org.apache.hadoop.hbase.client.Mutation;
55-
import org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor;
5656
import org.apache.hadoop.hbase.client.Put;
5757
import org.apache.hadoop.hbase.client.RegionLocator;
5858
import org.apache.hadoop.hbase.client.Result;
@@ -205,7 +205,7 @@ public void map(ImmutableBytesWritable row, Result value, Context context) throw
205205
filter == null || !filter.filterRowKey(
206206
PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(), (short) row.getLength()))
207207
) {
208-
for (ExtendedCell kv : PackagePrivateFieldAccessor.getExtendedRawCells(value)) {
208+
for (ExtendedCell kv : ClientInternalHelper.getExtendedRawCells(value)) {
209209
kv = filterKv(filter, kv);
210210
// skip if we filtered it out
211211
if (kv == null) {
@@ -271,7 +271,7 @@ public void map(ImmutableBytesWritable row, Result value, Context context) throw
271271
filter == null || !filter.filterRowKey(
272272
PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(), (short) row.getLength()))
273273
) {
274-
for (ExtendedCell kv : PackagePrivateFieldAccessor.getExtendedRawCells(value)) {
274+
for (ExtendedCell kv : ClientInternalHelper.getExtendedRawCells(value)) {
275275
kv = filterKv(filter, kv);
276276
// skip if we filtered it out
277277
if (kv == null) {
@@ -336,7 +336,7 @@ private void writeResult(ImmutableBytesWritable key, Result result, Context cont
336336

337337
protected void processKV(ImmutableBytesWritable key, Result result, Context context, Put put,
338338
Delete delete) throws IOException, InterruptedException {
339-
for (ExtendedCell kv : PackagePrivateFieldAccessor.getExtendedRawCells(result)) {
339+
for (ExtendedCell kv : ClientInternalHelper.getExtendedRawCells(result)) {
340340
kv = filterKv(filter, kv);
341341
// skip if we filter it out
342342
if (kv == null) {

‎hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/PutCombiner.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.Map;
2323
import java.util.Map.Entry;
2424
import org.apache.hadoop.hbase.ExtendedCell;
25-
import org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor;
25+
import org.apache.hadoop.hbase.client.ClientInternalHelper;
2626
import org.apache.hadoop.hbase.client.Put;
2727
import org.apache.hadoop.mapreduce.Reducer;
2828
import org.apache.yetus.audience.InterfaceAudience;
@@ -55,9 +55,9 @@ protected void reduce(K row, Iterable<Put> vals, Context context)
5555
cnt++;
5656
if (combinedPut == null) {
5757
combinedPut = p;
58-
combinedFamilyMap = PackagePrivateFieldAccessor.getExtendedFamilyCellMap(combinedPut);
58+
combinedFamilyMap = ClientInternalHelper.getExtendedFamilyCellMap(combinedPut);
5959
} else {
60-
for (Entry<byte[], List<ExtendedCell>> entry : PackagePrivateFieldAccessor
60+
for (Entry<byte[], List<ExtendedCell>> entry : ClientInternalHelper
6161
.getExtendedFamilyCellMap(p).entrySet()) {
6262
List<ExtendedCell> existCells = combinedFamilyMap.get(entry.getKey());
6363
if (existCells == null) {

‎hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/PutSortReducer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.apache.hadoop.hbase.Tag;
3232
import org.apache.hadoop.hbase.TagType;
3333
import org.apache.hadoop.hbase.TagUtil;
34-
import org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor;
34+
import org.apache.hadoop.hbase.client.ClientInternalHelper;
3535
import org.apache.hadoop.hbase.client.Put;
3636
import org.apache.hadoop.hbase.exceptions.DeserializationException;
3737
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
@@ -100,8 +100,7 @@ protected void reduce(ImmutableBytesWritable row, Iterable<Put> puts,
100100
// just ignoring the bad one?
101101
throw new IOException("Invalid visibility expression found in mutation " + p, e);
102102
}
103-
for (List<ExtendedCell> cells : PackagePrivateFieldAccessor.getExtendedFamilyCellMap(p)
104-
.values()) {
103+
for (List<ExtendedCell> cells : ClientInternalHelper.getExtendedFamilyCellMap(p).values()) {
105104
for (ExtendedCell cell : cells) {
106105
// Creating the KV which needs to be directly written to HFiles. Using the Facade
107106
// KVCreator for creation of kvs.

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
import org.apache.hadoop.hbase.PrivateCellUtil;
5454
import org.apache.hadoop.hbase.TableName;
5555
import org.apache.hadoop.hbase.Tag;
56+
import org.apache.hadoop.hbase.client.ClientInternalHelper;
5657
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
5758
import org.apache.hadoop.hbase.client.Connection;
5859
import org.apache.hadoop.hbase.client.ConnectionFactory;
5960
import org.apache.hadoop.hbase.client.Delete;
6061
import org.apache.hadoop.hbase.client.Durability;
6162
import org.apache.hadoop.hbase.client.Get;
6263
import org.apache.hadoop.hbase.client.Mutation;
63-
import org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor;
6464
import org.apache.hadoop.hbase.client.Put;
6565
import org.apache.hadoop.hbase.client.RegionInfo;
6666
import org.apache.hadoop.hbase.client.Result;
@@ -366,7 +366,7 @@ public void testWithDeletes() throws Throwable {
366366
s.setRaw(true);
367367
ResultScanner scanner = t.getScanner(s);
368368
Result r = scanner.next();
369-
ExtendedCell[] res = PackagePrivateFieldAccessor.getExtendedRawCells(r);
369+
ExtendedCell[] res = ClientInternalHelper.getExtendedRawCells(r);
370370
assertTrue(PrivateCellUtil.isDeleteFamily(res[0]));
371371
assertEquals(now + 4, res[1].getTimestamp());
372372
assertEquals(now + 3, res[2].getTimestamp());
@@ -934,8 +934,7 @@ public void testTagsWithEmptyCodec() throws Exception {
934934
int count = 0;
935935
Result result;
936936
while ((result = scanner.next()) != null) {
937-
List<ExtendedCell> cells =
938-
Arrays.asList(PackagePrivateFieldAccessor.getExtendedRawCells(result));
937+
List<ExtendedCell> cells = Arrays.asList(ClientInternalHelper.getExtendedRawCells(result));
939938
assertEquals(2, cells.size());
940939
ExtendedCell cell = cells.get(0);
941940
assertTrue(CellUtil.isDelete(cell));

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;
5151
import org.apache.hadoop.hbase.wal.WAL;
5252
import org.apache.hadoop.hbase.wal.WALEdit;
53+
import org.apache.hadoop.hbase.wal.WALEditInternalHelper;
5354
import org.apache.hadoop.hbase.wal.WALFactory;
5455
import org.apache.hadoop.hbase.wal.WALKey;
5556
import org.apache.hadoop.hbase.wal.WALKeyImpl;
@@ -143,10 +144,12 @@ public void testPartialRead() throws Exception {
143144
// being millisecond based.
144145
long ts = EnvironmentEdgeManager.currentTime();
145146
WALEdit edit = new WALEdit();
146-
edit.add(new KeyValue(rowName, family, Bytes.toBytes("1"), ts, value));
147+
WALEditInternalHelper.addExtendedCell(edit,
148+
new KeyValue(rowName, family, Bytes.toBytes("1"), ts, value));
147149
log.appendData(info, getWalKeyImpl(ts, scopes), edit);
148150
edit = new WALEdit();
149-
edit.add(new KeyValue(rowName, family, Bytes.toBytes("2"), ts + 1, value));
151+
WALEditInternalHelper.addExtendedCell(edit,
152+
new KeyValue(rowName, family, Bytes.toBytes("2"), ts + 1, value));
150153
log.appendData(info, getWalKeyImpl(ts + 1, scopes), edit);
151154
log.sync();
152155
Threads.sleep(10);
@@ -158,10 +161,12 @@ public void testPartialRead() throws Exception {
158161
long ts1 = EnvironmentEdgeManager.currentTime();
159162

160163
edit = new WALEdit();
161-
edit.add(new KeyValue(rowName, family, Bytes.toBytes("3"), ts1 + 1, value));
164+
WALEditInternalHelper.addExtendedCell(edit,
165+
new KeyValue(rowName, family, Bytes.toBytes("3"), ts1 + 1, value));
162166
log.appendData(info, getWalKeyImpl(ts1 + 1, scopes), edit);
163167
edit = new WALEdit();
164-
edit.add(new KeyValue(rowName, family, Bytes.toBytes("4"), ts1 + 2, value));
168+
WALEditInternalHelper.addExtendedCell(edit,
169+
new KeyValue(rowName, family, Bytes.toBytes("4"), ts1 + 2, value));
165170
log.appendData(info, getWalKeyImpl(ts1 + 2, scopes), edit);
166171
log.sync();
167172
log.shutdown();
@@ -203,8 +208,8 @@ public void testWALRecordReader() throws Exception {
203208
WAL log = walfactory.getWAL(info);
204209
byte[] value = Bytes.toBytes("value");
205210
WALEdit edit = new WALEdit();
206-
edit.add(new KeyValue(rowName, family, Bytes.toBytes("1"), EnvironmentEdgeManager.currentTime(),
207-
value));
211+
WALEditInternalHelper.addExtendedCell(edit, new KeyValue(rowName, family, Bytes.toBytes("1"),
212+
EnvironmentEdgeManager.currentTime(), value));
208213
long txid =
209214
log.appendData(info, getWalKeyImpl(EnvironmentEdgeManager.currentTime(), scopes), edit);
210215
log.sync(txid);
@@ -214,8 +219,8 @@ public void testWALRecordReader() throws Exception {
214219
log.rollWriter();
215220

216221
edit = new WALEdit();
217-
edit.add(new KeyValue(rowName, family, Bytes.toBytes("2"), EnvironmentEdgeManager.currentTime(),
218-
value));
222+
WALEditInternalHelper.addExtendedCell(edit, new KeyValue(rowName, family, Bytes.toBytes("2"),
223+
EnvironmentEdgeManager.currentTime(), value));
219224
txid = log.appendData(info, getWalKeyImpl(EnvironmentEdgeManager.currentTime(), scopes), edit);
220225
log.sync(txid);
221226
log.shutdown();
@@ -261,17 +266,17 @@ public void testWALRecordReaderActiveArchiveTolerance() throws Exception {
261266
WAL log = walfactory.getWAL(info);
262267
byte[] value = Bytes.toBytes("value");
263268
WALEdit edit = new WALEdit();
264-
edit.add(new KeyValue(rowName, family, Bytes.toBytes("1"), EnvironmentEdgeManager.currentTime(),
265-
value));
269+
WALEditInternalHelper.addExtendedCell(edit, new KeyValue(rowName, family, Bytes.toBytes("1"),
270+
EnvironmentEdgeManager.currentTime(), value));
266271
long txid =
267272
log.appendData(info, getWalKeyImpl(EnvironmentEdgeManager.currentTime(), scopes), edit);
268273
log.sync(txid);
269274

270275
Thread.sleep(10); // make sure 2nd edit gets a later timestamp
271276

272277
edit = new WALEdit();
273-
edit.add(new KeyValue(rowName, family, Bytes.toBytes("2"), EnvironmentEdgeManager.currentTime(),
274-
value));
278+
WALEditInternalHelper.addExtendedCell(edit, new KeyValue(rowName, family, Bytes.toBytes("2"),
279+
EnvironmentEdgeManager.currentTime(), value));
275280
txid = log.appendData(info, getWalKeyImpl(EnvironmentEdgeManager.currentTime(), scopes), edit);
276281
log.sync(txid);
277282
log.shutdown();

‎hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
import org.apache.hadoop.hbase.client.Append;
105105
import org.apache.hadoop.hbase.client.CheckAndMutate;
106106
import org.apache.hadoop.hbase.client.CheckAndMutateResult;
107+
import org.apache.hadoop.hbase.client.ClientInternalHelper;
107108
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
108109
import org.apache.hadoop.hbase.client.CompactionState;
109110
import org.apache.hadoop.hbase.client.Delete;
@@ -112,7 +113,6 @@
112113
import org.apache.hadoop.hbase.client.Increment;
113114
import org.apache.hadoop.hbase.client.IsolationLevel;
114115
import org.apache.hadoop.hbase.client.Mutation;
115-
import org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor;
116116
import org.apache.hadoop.hbase.client.Put;
117117
import org.apache.hadoop.hbase.client.RegionInfo;
118118
import org.apache.hadoop.hbase.client.RegionReplicaUtil;
@@ -181,6 +181,7 @@
181181
import org.apache.hadoop.hbase.util.Threads;
182182
import org.apache.hadoop.hbase.wal.WAL;
183183
import org.apache.hadoop.hbase.wal.WALEdit;
184+
import org.apache.hadoop.hbase.wal.WALEditInternalHelper;
184185
import org.apache.hadoop.hbase.wal.WALFactory;
185186
import org.apache.hadoop.hbase.wal.WALKey;
186187
import org.apache.hadoop.hbase.wal.WALKeyImpl;
@@ -3513,7 +3514,7 @@ protected void checkAndPrepareMutation(int index, long timestamp) throws IOExcep
35133514
// store the family map reference to allow for mutations
35143515
// we know that in mutation, only ExtendedCells are allow so here we do a fake cast, to
35153516
// simplify later logic
3516-
familyCellMaps[index] = PackagePrivateFieldAccessor.getExtendedFamilyCellMap(mutation);
3517+
familyCellMaps[index] = ClientInternalHelper.getExtendedFamilyCellMap(mutation);
35173518
}
35183519

35193520
// store durability for the batch (highest durability of all operations in the batch)
@@ -3709,7 +3710,9 @@ public boolean visit(int index) throws IOException {
37093710

37103711
// Add WAL edits from CPs.
37113712
WALEdit fromCP = walEditsFromCoprocessors[index];
3712-
List<Cell> cellsFromCP = fromCP == null ? Collections.emptyList() : fromCP.getCells();
3713+
List<ExtendedCell> cellsFromCP = fromCP == null
3714+
? Collections.emptyList()
3715+
: WALEditInternalHelper.getExtendedCells(fromCP);
37133716
addNonSkipWALMutationsToWALEdit(miniBatchOp, walEdit, cellsFromCP, familyCellMaps[index]);
37143717
return true;
37153718
}
@@ -3719,14 +3722,14 @@ public boolean visit(int index) throws IOException {
37193722

37203723
protected void addNonSkipWALMutationsToWALEdit(
37213724
final MiniBatchOperationInProgress<Mutation> miniBatchOp, WALEdit walEdit,
3722-
List<Cell> cellsFromCP, Map<byte[], List<ExtendedCell>> familyCellMap) {
3725+
List<ExtendedCell> cellsFromCP, Map<byte[], List<ExtendedCell>> familyCellMap) {
37233726
doAddCellsToWALEdit(walEdit, cellsFromCP, familyCellMap);
37243727
}
37253728

3726-
protected static void doAddCellsToWALEdit(WALEdit walEdit, List<Cell> cellsFromCP,
3729+
protected static void doAddCellsToWALEdit(WALEdit walEdit, List<ExtendedCell> cellsFromCP,
37273730
Map<byte[], List<ExtendedCell>> familyCellMap) {
3728-
walEdit.add(cellsFromCP);
3729-
walEdit.add((Map) familyCellMap);
3731+
WALEditInternalHelper.addExtendedCell(walEdit, cellsFromCP);
3732+
WALEditInternalHelper.addMap(walEdit, familyCellMap);
37303733
}
37313734

37323735
protected abstract void cacheSkipWALMutationForRegionReplication(
@@ -4064,7 +4067,7 @@ private Map<byte[], List<ExtendedCell>> reckonDeltas(Mutation mutation,
40644067
assert mutation instanceof Increment || mutation instanceof Append;
40654068
Map<byte[], List<ExtendedCell>> ret = new TreeMap<>(Bytes.BYTES_COMPARATOR);
40664069
// Process a Store/family at a time.
4067-
for (Map.Entry<byte[], List<ExtendedCell>> entry : PackagePrivateFieldAccessor
4070+
for (Map.Entry<byte[], List<ExtendedCell>> entry : ClientInternalHelper
40684071
.getExtendedFamilyCellMap(mutation).entrySet()) {
40694072
final byte[] columnFamilyName = entry.getKey();
40704073
List<ExtendedCell> deltas = (List) entry.getValue();
@@ -4260,7 +4263,7 @@ protected void cacheSkipWALMutationForRegionReplication(
42604263
this.createWALEditForReplicateSkipWAL(miniBatchOp, nonceKeyAndWALEdits);
42614264
miniBatchOp.setWalEditForReplicateIfExistsSkipWAL(walEditForReplicateIfExistsSkipWAL);
42624265
}
4263-
walEditForReplicateIfExistsSkipWAL.add((Map) familyCellMap);
4266+
WALEditInternalHelper.addMap(walEditForReplicateIfExistsSkipWAL, familyCellMap);
42644267

42654268
}
42664269

@@ -4279,8 +4282,7 @@ private WALEdit createWALEditForReplicateSkipWAL(
42794282
@Override
42804283
protected void addNonSkipWALMutationsToWALEdit(
42814284
final MiniBatchOperationInProgress<Mutation> miniBatchOp, WALEdit walEdit,
4282-
List<Cell> cellsFromCP, Map<byte[], List<ExtendedCell>> familyCellMap) {
4283-
4285+
List<ExtendedCell> cellsFromCP, Map<byte[], List<ExtendedCell>> familyCellMap) {
42844286
super.addNonSkipWALMutationsToWALEdit(miniBatchOp, walEdit, cellsFromCP, familyCellMap);
42854287
WALEdit walEditForReplicateIfExistsSkipWAL =
42864288
miniBatchOp.getWalEditForReplicateIfExistsSkipWAL();
@@ -4524,7 +4526,7 @@ private void checkAndMergeCPMutations(final MiniBatchOperationInProgress<Mutatio
45244526
// Returned mutations from coprocessor correspond to the Mutation at index i. We can
45254527
// directly add the cells from those mutations to the familyMaps of this mutation.
45264528
Map<byte[], List<ExtendedCell>> cpFamilyMap =
4527-
PackagePrivateFieldAccessor.getExtendedFamilyCellMap(cpMutation);
4529+
ClientInternalHelper.getExtendedFamilyCellMap(cpMutation);
45284530
region.rewriteCellTags(cpFamilyMap, mutation);
45294531
// will get added to the memStore later
45304532
mergeFamilyMaps(familyCellMaps[i], cpFamilyMap);
@@ -5096,16 +5098,16 @@ private CheckAndMutateResult checkAndMutateInternal(CheckAndMutate checkAndMutat
50965098
byte[] byteTs = Bytes.toBytes(ts);
50975099
if (mutation != null) {
50985100
if (mutation instanceof Put) {
5099-
updateCellTimestamps(
5100-
PackagePrivateFieldAccessor.getExtendedFamilyCellMap(mutation).values(), byteTs);
5101+
updateCellTimestamps(ClientInternalHelper.getExtendedFamilyCellMap(mutation).values(),
5102+
byteTs);
51015103
}
51025104
// And else 'delete' is not needed since it already does a second get, and sets the
51035105
// timestamp from get (see prepareDeleteTimestamps).
51045106
} else {
51055107
for (Mutation m : rowMutations.getMutations()) {
51065108
if (m instanceof Put) {
5107-
updateCellTimestamps(
5108-
PackagePrivateFieldAccessor.getExtendedFamilyCellMap(m).values(), byteTs);
5109+
updateCellTimestamps(ClientInternalHelper.getExtendedFamilyCellMap(m).values(),
5110+
byteTs);
51095111
}
51105112
}
51115113
// And else 'delete' is not needed since it already does a second get, and sets the

0 commit comments

Comments
 (0)