@@ -427,8 +427,7 @@ private void mergeDistributedResponses(SolrQueryResponse rsp, List<ShardResponse
427427 rsp .add (RSP_SHARDS , shardsInfo );
428428 }
429429
430- private void processShardFields (
431- ShardData shardData , Map <String , MergedFieldData > mergedFields ) {
430+ private void processShardFields (ShardData shardData , Map <String , MergedFieldData > mergedFields ) {
432431 if (shardData .shardFieldInfo == null ) {
433432 return ;
434433 }
@@ -481,17 +480,26 @@ private void mergeShardField(
481480 } else {
482481 // Subsequent shards: validate consistency
483482 validateFieldAttr (
484- fieldName , KEY_TYPE , fi .getType (),
483+ fieldName ,
484+ KEY_TYPE ,
485+ fi .getType (),
485486 fieldData .originalFieldInfo .getType (),
486- shardAddr , fieldData .originalShardAddr );
487+ shardAddr ,
488+ fieldData .originalShardAddr );
487489 validateFieldAttr (
488- fieldName , KEY_SCHEMA_FLAGS , fi .getSchema (),
490+ fieldName ,
491+ KEY_SCHEMA_FLAGS ,
492+ fi .getSchema (),
489493 fieldData .originalFieldInfo .getSchema (),
490- shardAddr , fieldData .originalShardAddr );
494+ shardAddr ,
495+ fieldData .originalShardAddr );
491496 validateFieldAttr (
492- fieldName , KEY_DYNAMIC_BASE , fi .getExtras ().get (KEY_DYNAMIC_BASE ),
497+ fieldName ,
498+ KEY_DYNAMIC_BASE ,
499+ fi .getExtras ().get (KEY_DYNAMIC_BASE ),
493500 fieldData .originalFieldInfo .getExtras ().get (KEY_DYNAMIC_BASE ),
494- shardAddr , fieldData .originalShardAddr );
501+ shardAddr ,
502+ fieldData .originalShardAddr );
495503
496504 Object indexFlags = fi .getExtras ().get (KEY_INDEX_FLAGS );
497505 if (indexFlags != null ) {
@@ -501,8 +509,12 @@ private void mergeShardField(
501509 fieldData .merged .add (KEY_INDEX_FLAGS , indexFlags );
502510 } else {
503511 validateFieldAttr (
504- fieldName , KEY_INDEX_FLAGS , indexFlags , fieldData .indexFlags ,
505- shardAddr , fieldData .indexFlagsShardAddr );
512+ fieldName ,
513+ KEY_INDEX_FLAGS ,
514+ indexFlags ,
515+ fieldData .indexFlags ,
516+ shardAddr ,
517+ fieldData .indexFlagsShardAddr );
506518 }
507519 }
508520 }
0 commit comments