@@ -97,22 +97,24 @@ public static CompactSketch union(final CompactSketch skA, final CompactSketch s
9797 return null ;
9898 }
9999 case 6 : { //skA == null; skB == empty; return empty
100- return (skB .getThetaLong () == Long .MAX_VALUE ) ? skB : //lgtm [java/dereferenced-value-may-be-null]
101- HeapCompactOrderedSketch .compact (new long [0 ], true , skB .getSeedHash (), 0 , Long .MAX_VALUE );
100+ final long thetaLong = skB .getThetaLong (); //lgtm [java/dereferenced-value-may-be-null]
101+ return (thetaLong == Long .MAX_VALUE ) ? skB
102+ : HeapCompactOrderedSketch .compact (new long [0 ], true , skB .getSeedHash (), 0 , Long .MAX_VALUE );
102103 }
103104 case 7 : { //skA == null; skB == valid; return skB
104105 return maybeCutback (skB , k );
105106 }
106107 case 9 : { //skA == empty; skB == null; return empty
107- return (skA .getThetaLong () == Long .MAX_VALUE ) ? skA : //lgtm [java/dereferenced-value-may-be-null]
108- HeapCompactOrderedSketch .compact (new long [0 ], true , skA .getSeedHash (), 0 , Long .MAX_VALUE );
108+ final long thetaLong = skA .getThetaLong (); //lgtm [java/dereferenced-value-may-be-null]
109+ return (thetaLong == Long .MAX_VALUE ) ? skA
110+ : HeapCompactOrderedSketch .compact (new long [0 ], true , skA .getSeedHash (), 0 , Long .MAX_VALUE );
109111 }
110112 case 10 : { //skA == empty; skB == empty; return empty
111113 final short seedHash = seedHashesCheck (skA , skB );
112- if ( skA .getThetaLong () == Long . MAX_VALUE ) //lgtm [java/dereferenced-value-may-be-null]
113- { return skA ; }
114- if ( skB .getThetaLong () == Long . MAX_VALUE ) //lgtm [java/dereferenced-value-may-be-null]
115- { return skB ; }
114+ long thetaLong = skA .getThetaLong (); //lgtm [java/dereferenced-value-may-be-null]
115+ if ( thetaLong == Long . MAX_VALUE ) { return skA ; }
116+ thetaLong = skB .getThetaLong (); //lgtm [java/dereferenced-value-may-be-null]
117+ if ( thetaLong == Long . MAX_VALUE ) { return skB ; }
116118 return HeapCompactOrderedSketch .compact (new long [0 ], true , seedHash , 0 , Long .MAX_VALUE );
117119 }
118120 case 11 : { //skA == empty; skB == valid; return skB
@@ -135,7 +137,9 @@ public static CompactSketch union(final CompactSketch skA, final CompactSketch s
135137
136138 //Both sketches are valid with matching seedhashes and ordered
137139 //Full Union operation:
138- long thetaLong = Math .min (skA .getThetaLong (), skB .getThetaLong ()); //Theta rule
140+ final long thetaLongA = skA .getThetaLong (); //lgtm [java/dereferenced-value-may-be-null]
141+ final long thetaLongB = skB .getThetaLong (); //lgtm [java/dereferenced-value-may-be-null]
142+ long thetaLong = Math .min (thetaLongA , thetaLongB ); //Theta rule
139143 final long [] cacheA = (skA .hasMemory ()) ? skA .getCache () : skA .getCache ().clone ();
140144 final long [] cacheB = (skB .hasMemory ()) ? skB .getCache () : skB .getCache ().clone ();
141145 final int aLen = cacheA .length ;
0 commit comments