Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Jenkins Hash #40

Merged
merged 1 commit into from
Nov 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.0.0

- Update hashCode implementation to use `Jenkins Hash` ([#39](https://github.com/felangel/equatable/issues/39)).
- Documentation Updates

# 0.6.1

- Minor documentation updates
Expand Down
47 changes: 25 additions & 22 deletions lib/src/equatable_utils.dart
Original file line number Diff line number Diff line change
@@ -1,27 +1,7 @@
import 'package:collection/collection.dart';

int mapPropsToHashCode(dynamic props) {
int hashCode = 0;

if (props is Map) {
props.forEach((key, value) {
final propHashCode = mapPropsToHashCode(key) ^ mapPropsToHashCode(value);
hashCode = hashCode ^ propHashCode;
});
} else if (props is List || props is Iterable || props is Set) {
props.forEach((prop) {
final propHashCode =
(prop is List || prop is Iterable || prop is Set || prop is Map)
? mapPropsToHashCode(prop)
: prop.hashCode;
hashCode = hashCode ^ propHashCode;
});
} else {
hashCode = hashCode ^ props.hashCode;
}

return hashCode;
}
int mapPropsToHashCode(Iterable props) =>
_finish(props.fold(0, (hash, object) => _combine(hash, object)));

const DeepCollectionEquality _equality = DeepCollectionEquality();

Expand All @@ -45,3 +25,26 @@ bool equals(List list1, List list2) {
}
return true;
}

/// Jenkins Hash Functions
/// https://en.wikipedia.org/wiki/Jenkins_hash_function
int _combine(int hash, dynamic object) {
if (object is Map) {
object.forEach((key, value) {
hash = _combine(hash, [key, value]);
});
return hash;
}
if (object is Iterable) {
return mapPropsToHashCode(object);
}
hash = 0x1fffffff & (hash + object.hashCode);
hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
return hash ^ (hash >> 6);
}

int _finish(int hash) {
hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
hash = hash ^ (hash >> 11);
return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
}
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: equatable
description: An abstract class that helps to implement equality without needing to explicitly override == and hashCode.
version: 0.6.1
version: 1.0.0
author: Felix Angelov <felangelov@gmail.com>
homepage: https://github.com/felangel/equatable

Expand Down
36 changes: 20 additions & 16 deletions test/equatable_mixin_test.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'dart:convert';

import 'package:equatable/src/equatable_utils.dart';
import 'package:test/test.dart';
import 'package:equatable/equatable.dart';

Expand Down Expand Up @@ -102,7 +103,10 @@ void main() {

test('should return correct hashCode', () {
final instance = EmptyEquatable();
expect(instance.hashCode, instance.runtimeType.hashCode);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

test('should return true when instances are different', () {
Expand Down Expand Up @@ -134,7 +138,7 @@ void main() {
final instance = SimpleEquatable('simple');
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ instance.data.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -179,7 +183,7 @@ void main() {
final instance = SimpleEquatable(0);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ instance.data.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -218,7 +222,7 @@ void main() {
final instance = SimpleEquatable(true);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ instance.data.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -265,7 +269,7 @@ void main() {
));
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ instance.data.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -309,6 +313,7 @@ void main() {
final instance = MultipartEquatable("s1", "s2");
expect(instance.toString(), 'MultipartEquatable<String>');
});

test('should return true when instance is the same', () {
final instance = MultipartEquatable("s1", "s2");
expect(instance == instance, true);
Expand All @@ -318,12 +323,17 @@ void main() {
final instance = MultipartEquatable("s1", "s2");
expect(
instance.hashCode,
instance.runtimeType.hashCode ^
instance.d1.hashCode ^
instance.d2.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

test('should return different hashCodes when property order has changed',
() {
final instance1 = MultipartEquatable("s1", "s2");
final instance2 = MultipartEquatable("s2", "s1");
expect(instance1.hashCode == instance2.hashCode, isFalse);
});

test('should return true when instances are different', () {
final instanceA = MultipartEquatable("s1", "s2");
final instanceB = MultipartEquatable("s1", "s2");
Expand Down Expand Up @@ -377,11 +387,7 @@ void main() {
);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^
instance.name.hashCode ^
instance.age.hashCode ^
instance.hairColor.hashCode ^
instance.children[0].hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -466,9 +472,7 @@ void main() {
) as Map<String, dynamic>);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^
instance.username.hashCode ^
instance.password.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down
36 changes: 20 additions & 16 deletions test/equatable_test.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'dart:convert';

import 'package:equatable/src/equatable_utils.dart';
import 'package:test/test.dart';

import 'package:equatable/equatable.dart';
Expand Down Expand Up @@ -105,7 +106,10 @@ void main() {

test('should return correct hashCode', () {
final instance = EmptyEquatable();
expect(instance.hashCode, instance.runtimeType.hashCode);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

test('should return true when instances are different', () {
Expand Down Expand Up @@ -137,7 +141,7 @@ void main() {
final instance = SimpleEquatable('simple');
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ instance.data.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -187,7 +191,7 @@ void main() {
final instance = SimpleEquatable(0);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ instance.data.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -226,7 +230,7 @@ void main() {
final instance = SimpleEquatable(true);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ instance.data.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -273,7 +277,7 @@ void main() {
));
expect(
instance.hashCode,
instance.runtimeType.hashCode ^ instance.data.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -317,6 +321,7 @@ void main() {
final instance = MultipartEquatable("s1", "s2");
expect(instance.toString(), 'MultipartEquatable<String>');
});

test('should return true when instance is the same', () {
final instance = MultipartEquatable("s1", "s2");
expect(instance == instance, true);
Expand All @@ -326,12 +331,17 @@ void main() {
final instance = MultipartEquatable("s1", "s2");
expect(
instance.hashCode,
instance.runtimeType.hashCode ^
instance.d1.hashCode ^
instance.d2.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

test('should return different hashCodes when property order has changed',
() {
final instance1 = MultipartEquatable("s1", "s2");
final instance2 = MultipartEquatable("s2", "s1");
expect(instance1.hashCode == instance2.hashCode, isFalse);
});

test('should return true when instances are different', () {
final instanceA = MultipartEquatable("s1", "s2");
final instanceB = MultipartEquatable("s1", "s2");
Expand Down Expand Up @@ -385,11 +395,7 @@ void main() {
);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^
instance.name.hashCode ^
instance.age.hashCode ^
instance.hairColor.hashCode ^
instance.children[0].hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down Expand Up @@ -474,9 +480,7 @@ void main() {
) as Map<String, dynamic>);
expect(
instance.hashCode,
instance.runtimeType.hashCode ^
instance.username.hashCode ^
instance.password.hashCode,
instance.runtimeType.hashCode ^ mapPropsToHashCode(instance.props),
);
});

Expand Down