@@ -169,9 +169,13 @@ private class CachedGroup {
169169
170170 /** Updates group from proto, including its tablets. */
171171 void update (Group groupIn ) {
172- System .out .println ("DEBUG [BYPASS]: Group.update for group " + groupUid
173- + ", incoming tablets: " + groupIn .getTabletsCount ()
174- + ", leader_index: " + groupIn .getLeaderIndex ());
172+ System .out .println (
173+ "DEBUG [BYPASS]: Group.update for group "
174+ + groupUid
175+ + ", incoming tablets: "
176+ + groupIn .getTabletsCount ()
177+ + ", leader_index: "
178+ + groupIn .getLeaderIndex ());
175179
176180 // Only update leader if generation is newer
177181 if (ByteString .unsignedLexicographicalComparator ()
@@ -221,48 +225,74 @@ void update(Group groupIn) {
221225 CachedTablet tablet = tabletsByUid .get (tabletIn .getTabletUid ());
222226 if (tablet == null ) {
223227 tablet = new CachedTablet ();
224- System .out .println ("DEBUG [BYPASS]: Created new tablet for uid " + tabletIn .getTabletUid ());
228+ System .out .println (
229+ "DEBUG [BYPASS]: Created new tablet for uid " + tabletIn .getTabletUid ());
225230 }
226231 tablet .update (tabletIn );
227- System .out .println ("DEBUG [BYPASS]: Tablet[" + t + "]: uid=" + tablet .tabletUid
228- + ", server=" + tablet .serverAddress
229- + ", distance=" + tablet .distance );
232+ System .out .println (
233+ "DEBUG [BYPASS]: Tablet["
234+ + t
235+ + "]: uid="
236+ + tablet .tabletUid
237+ + ", server="
238+ + tablet .serverAddress
239+ + ", distance="
240+ + tablet .distance );
230241 newTablets .add (tablet );
231242 }
232243 tablets = newTablets ;
233- System .out .println ("DEBUG [BYPASS]: Group " + groupUid + " now has " + tablets .size () + " tablets" );
244+ System .out .println (
245+ "DEBUG [BYPASS]: Group " + groupUid + " now has " + tablets .size () + " tablets" );
234246 }
235247
236248 /** Fills routing hint with tablet information and returns the server. */
237249 ChannelFinderServer fillRoutingHint (boolean preferLeader , RoutingHint .Builder hintBuilder ) {
238- System .out .println ("DEBUG [BYPASS]: Group.fillRoutingHint - preferLeader: " + preferLeader
239- + ", tablets count: " + tablets .size ());
250+ System .out .println (
251+ "DEBUG [BYPASS]: Group.fillRoutingHint - preferLeader: "
252+ + preferLeader
253+ + ", tablets count: "
254+ + tablets .size ());
240255
241256 // Try leader first if preferred
242257 if (preferLeader && hasLeader ()) {
243258 CachedTablet leaderTablet = leader ();
244- System .out .println ("DEBUG [BYPASS]: Trying leader tablet: uid=" + leaderTablet .tabletUid
245- + ", address=" + leaderTablet .serverAddress
246- + ", skip=" + leaderTablet .skip );
259+ System .out .println (
260+ "DEBUG [BYPASS]: Trying leader tablet: uid="
261+ + leaderTablet .tabletUid
262+ + ", address="
263+ + leaderTablet .serverAddress
264+ + ", skip="
265+ + leaderTablet .skip );
247266 if (!leaderTablet .shouldSkip (hintBuilder )) {
248267 ChannelFinderServer server = leaderTablet .pick (hintBuilder );
249- System .out .println ("DEBUG [BYPASS]: Leader tablet picked, server: "
250- + (server != null ? server .getAddress () : "null" ));
268+ System .out .println (
269+ "DEBUG [BYPASS]: Leader tablet picked, server: "
270+ + (server != null ? server .getAddress () : "null" ));
251271 return server ;
252272 }
253273 }
254274
255275 // Try other tablets in order (they're ordered by distance)
256276 for (int i = 0 ; i < tablets .size (); i ++) {
257277 CachedTablet tablet = tablets .get (i );
258- System .out .println ("DEBUG [BYPASS]: Trying tablet[" + i + "]: uid=" + tablet .tabletUid
259- + ", address=" + tablet .serverAddress
260- + ", distance=" + tablet .distance
261- + ", skip=" + tablet .skip );
278+ System .out .println (
279+ "DEBUG [BYPASS]: Trying tablet["
280+ + i
281+ + "]: uid="
282+ + tablet .tabletUid
283+ + ", address="
284+ + tablet .serverAddress
285+ + ", distance="
286+ + tablet .distance
287+ + ", skip="
288+ + tablet .skip );
262289 if (!tablet .shouldSkip (hintBuilder )) {
263290 ChannelFinderServer server = tablet .pick (hintBuilder );
264- System .out .println ("DEBUG [BYPASS]: Tablet[" + i + "] picked, server: "
265- + (server != null ? server .getAddress () : "null" ));
291+ System .out .println (
292+ "DEBUG [BYPASS]: Tablet["
293+ + i
294+ + "] picked, server: "
295+ + (server != null ? server .getAddress () : "null" ));
266296 return server ;
267297 }
268298 }
@@ -449,22 +479,32 @@ private boolean isNewerOrSame(
449479
450480 /** Applies cache updates. Tablets are processed inside group updates. */
451481 public void addRanges (CacheUpdate cacheUpdate ) {
452- System .out .println ("DEBUG [BYPASS]: addRanges called with "
453- + cacheUpdate .getGroupCount () + " groups, "
454- + cacheUpdate .getRangeCount () + " ranges" );
482+ System .out .println (
483+ "DEBUG [BYPASS]: addRanges called with "
484+ + cacheUpdate .getGroupCount ()
485+ + " groups, "
486+ + cacheUpdate .getRangeCount ()
487+ + " ranges" );
455488
456489 // Insert all groups. Tablets are processed inside findOrInsertGroup -> Group.update()
457490 List <CachedGroup > newGroups = new ArrayList <>();
458491 for (Group groupIn : cacheUpdate .getGroupList ()) {
459- System .out .println ("DEBUG [BYPASS]: Processing group " + groupIn .getGroupUid ()
460- + " with " + groupIn .getTabletsCount () + " tablets" );
492+ System .out .println (
493+ "DEBUG [BYPASS]: Processing group "
494+ + groupIn .getGroupUid ()
495+ + " with "
496+ + groupIn .getTabletsCount ()
497+ + " tablets" );
461498 newGroups .add (findOrInsertGroup (groupIn ));
462499 }
463500
464501 // Process ranges
465502 for (Range rangeIn : cacheUpdate .getRangeList ()) {
466- System .out .println ("DEBUG [BYPASS]: Processing range for group " + rangeIn .getGroupUid ()
467- + ", split_id=" + rangeIn .getSplitId ());
503+ System .out .println (
504+ "DEBUG [BYPASS]: Processing range for group "
505+ + rangeIn .getGroupUid ()
506+ + ", split_id="
507+ + rangeIn .getSplitId ());
468508 replaceRangeIfNewer (rangeIn );
469509 }
470510
@@ -473,16 +513,24 @@ public void addRanges(CacheUpdate cacheUpdate) {
473513 unref (g );
474514 }
475515
476- System .out .println ("DEBUG [BYPASS]: After addRanges - ranges: " + ranges .size ()
477- + ", groups: " + groups .size () + ", servers: " + servers .size ());
516+ System .out .println (
517+ "DEBUG [BYPASS]: After addRanges - ranges: "
518+ + ranges .size ()
519+ + ", groups: "
520+ + groups .size ()
521+ + ", servers: "
522+ + servers .size ());
478523 }
479524
480525 /** Fills routing hint and returns the server to use. */
481526 public ChannelFinderServer fillRoutingInfo (
482527 String sessionUri , boolean preferLeader , RoutingHint .Builder hintBuilder ) {
483- System .out .println ("DEBUG [BYPASS]: fillRoutingInfo called, ranges in cache: " + ranges .size ()
484- + ", groups in cache: " + groups .size ());
485-
528+ System .out .println (
529+ "DEBUG [BYPASS]: fillRoutingInfo called, ranges in cache: "
530+ + ranges .size ()
531+ + ", groups in cache: "
532+ + groups .size ());
533+
486534 if (hintBuilder .getKey ().isEmpty ()) {
487535 System .out .println ("DEBUG [BYPASS]: No key in hint, using default server" );
488536 return serverFactory .defaultServer ();
@@ -505,8 +553,9 @@ public ChannelFinderServer fillRoutingInfo(
505553 if (ByteString .unsignedLexicographicalComparator ().compare (requestKey , range .startKey ) >= 0 ) {
506554 targetRange = range ;
507555 targetRangeLimitKey = rangeLimit ;
508- System .out .println ("DEBUG [BYPASS]: Found range for key, group_uid: "
509- + (range .group != null ? range .group .groupUid : "null" ));
556+ System .out .println (
557+ "DEBUG [BYPASS]: Found range for key, group_uid: "
558+ + (range .group != null ? range .group .groupUid : "null" ));
510559 }
511560 }
512561
@@ -539,10 +588,16 @@ public ChannelFinderServer fillRoutingInfo(
539588 hintBuilder .setKey (targetRange .startKey );
540589 hintBuilder .setLimitKey (targetRangeLimitKey );
541590
542- System .out .println ("DEBUG [BYPASS]: Group " + targetRange .group .groupUid
543- + " has " + targetRange .group .tablets .size () + " tablets"
544- + ", hasLeader: " + targetRange .group .hasLeader ()
545- + ", leaderIndex: " + targetRange .group .leaderIndex );
591+ System .out .println (
592+ "DEBUG [BYPASS]: Group "
593+ + targetRange .group .groupUid
594+ + " has "
595+ + targetRange .group .tablets .size ()
596+ + " tablets"
597+ + ", hasLeader: "
598+ + targetRange .group .hasLeader ()
599+ + ", leaderIndex: "
600+ + targetRange .group .leaderIndex );
546601
547602 // Let the group pick the tablet
548603 ChannelFinderServer server = targetRange .group .fillRoutingHint (preferLeader , hintBuilder );
0 commit comments