소스 검색

Improve performance of Util.collectionEquals (#16968).

This change checks the length of both collections first before iterating
them. This massively speeds up the comparison in case the collections do
not have the same length.

Also in the case where the lengths are equal, this saves the
collection2.hasNext() checks.

Change-Id: If1325f3581d12bf742d77fbf8b0f89511fa11252
tags/7.5.0.alpha1
Fabian Lange 9 년 전
부모
커밋
cc8829ccf3
1개의 변경된 파일9개의 추가작업 그리고 10개의 파일을 삭제
  1. 9
    10
      client/src/com/vaadin/client/Util.java

+ 9
- 10
client/src/com/vaadin/client/Util.java 파일 보기

@@ -825,30 +825,29 @@ public class Util {
* @return true if the collections contain the same elements in the same
* order, false otherwise
*/
public static boolean collectionsEquals(Collection collection1,
Collection collection2) {
public static boolean collectionsEquals(Collection<?> collection1,
Collection<?> collection2) {
if (collection1 == null) {
return collection2 == null;
}
if (collection2 == null) {
return false;
}
Iterator<Object> collection1Iterator = collection1.iterator();
Iterator<Object> collection2Iterator = collection2.iterator();

if (collection1.size() != collection2.size()) {
return false;
}

Iterator<?> collection1Iterator = collection1.iterator();
Iterator<?> collection2Iterator = collection2.iterator();

while (collection1Iterator.hasNext()) {
if (!collection2Iterator.hasNext()) {
return false;
}
Object collection1Object = collection1Iterator.next();
Object collection2Object = collection2Iterator.next();
if (collection1Object != collection2Object) {
return false;
}
}
if (collection2Iterator.hasNext()) {
return false;
}

return true;
}

Loading…
취소
저장