Skip to content

Commit 50e0538

Browse files
dmillerdmiller
committed
CLJCLR-142 rework hashing to provide stable hashing for strings and things that depend on them. Allows macro case to be stable
1 parent 4cd0ab5 commit 50e0538

File tree

14 files changed

+70
-64
lines changed

14 files changed

+70
-64
lines changed

‎Clojure/Clojure.Source/clojure/core_deftype.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
hq#)))
186186
`(GetHashCode [this#] (let [hash# ~'__hash] ;;; hashCode
187187
(if (zero? hash#)
188-
(let [h# (clojure.lang.APersistentMap/mapHash this#)]
188+
(let [h# (clojure.lang.APersistentMap/mapHasheq this#)] ;;; mapHash
189189
(set! ~'__hash h#)
190190
h#)
191191
hash#)))

‎Clojure/Clojure.Source/clojure/gvec.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Object
142142
(let [v (first s)]
143143
(if (nil? v)
144144
(recur (unchecked-multiply-int 31 hash) (next s))
145-
(recur (unchecked-add-int (unchecked-multiply-int 31 hash) (.GetHashCode ^Object v)) (next s)))) ;;; .hashCode
145+
(recur (unchecked-add-int (unchecked-multiply-int 31 hash) (clojure.lang.Util/hasheq ^Object v)) (next s)))) ;;; .hashCode
146146
hash)))
147147
(Equals [this other] ;;; equals
148148
(cond (identical? this other) true

‎Clojure/Clojure.Tests/clojure/test_clojure/control.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@
429429
:symbol 'a
430430
:keyword :foo
431431
:set '#{a}))
432-
(testing "test warn for hash collision"
432+
#_(testing "test warn for hash collision" ;;; I don't know at this point how to find two values that would cause a hash collision.
433433
(should-print-err-message
434434
#"Performance warning, .*:\d+ - hash collision of some case test constants; if selected, those entries will be tested sequentially..*\r?\n"
435435
(case 1 1 :long 9223372039002259457N :big 2)))

‎Clojure/Clojure.Tests/clojure/test_clojure/data_structures.clj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,8 +1117,8 @@
11171117
(is (= b a) msg)
11181118
(is (.Equals ^Object a b) msg) ;;; .equals
11191119
(is (.Equals ^Object b a) msg) ;;; .equals
1120-
(is (= (hash a) (hash b)) msg)
1121-
(is (= (.GetHashCode ^Object a) (.GetHashCode ^Object b)) msg))) ;;; .hashCode .hashCode
1120+
#_(is (= (hash a) (hash b)) msg) ;;; no longer true for us
1121+
#_(is (= (.GetHashCode ^Object a) (.GetHashCode ^Object b)) msg))) ;;; no longer true for us .hashCode .hashCode
11221122

11231123
(deftest ordered-collection-equality-test
11241124
(let [empty-colls [ []

‎Clojure/Clojure/Lib/APersistentMap.cs‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public abstract class APersistentMap: AFn, IPersistentMap, IDictionary, IEnumera
3131
/// Caches the hash code, when computed.
3232
/// </summary>
3333
/// <remarks>The default value indicates that the hash code has not been computed yet.</remarks>
34-
int _hash;
34+
//int _hash;
3535

3636
/// <summary>
3737
/// Caches the hashseq code, when computed.
@@ -104,24 +104,25 @@ public static bool mapEquals(IPersistentMap m1, Object obj)
104104
/// <remarks>Valud-based = relies on all entries. Once computed, it is cached.</remarks>
105105
public override int GetHashCode()
106106
{
107-
int cached = _hash;
108-
if ( cached == 0 )
109-
_hash = cached = mapHash(this);
110-
return cached;
111-
}
112-
113-
[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "ClojureJVM name match")]
114-
public static int mapHash(IPersistentMap m)
115-
{
116-
int hash = 0;
117-
for (ISeq s = m.seq(); s != null; s = s.next())
118-
{
119-
IMapEntry me = (IMapEntry)s.first();
120-
hash += (me.key() == null ? 0 : me.key().GetHashCode())
121-
^ (me.val() == null ? 0 : me.val().GetHashCode());
122-
}
123-
return hash;
124-
}
107+
return hasheq();
108+
//int cached = _hash;
109+
//if ( cached == 0 )
110+
// _hash = cached = mapHash(this);
111+
//return cached;
112+
}
113+
114+
//[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "ClojureJVM name match")]
115+
//public static int mapHash(IPersistentMap m)
116+
//{
117+
// int hash = 0;
118+
// for (ISeq s = m.seq(); s != null; s = s.next())
119+
// {
120+
// IMapEntry me = (IMapEntry)s.first();
121+
// hash += (me.key() == null ? 0 : me.key().GetHashCode())
122+
// ^ (me.val() == null ? 0 : me.val().GetHashCode());
123+
// }
124+
// return hash;
125+
//}
125126

126127

127128
#endregion

‎Clojure/Clojure/Lib/APersistentSet.cs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,18 @@ public override string ToString()
7474
/// Once computed, the value is cached.</remarks>
7575
public override int GetHashCode()
7676
{
77-
int hash = _hash;
78-
if (hash == 0)
79-
{
80-
for (ISeq s = seq(); s != null; s = s.next())
81-
{
82-
object e = s.first();
83-
hash += Util.hash(e);
84-
}
85-
_hash = hash;
86-
}
87-
return hash;
77+
return hasheq();
78+
//int hash = _hash;
79+
//if (hash == 0)
80+
//{
81+
// for (ISeq s = seq(); s != null; s = s.next())
82+
// {
83+
// object e = s.first();
84+
// hash += Util.hash(e);
85+
// }
86+
// _hash = hash;
87+
//}
88+
//return hash;
8889
}
8990

9091
/// <summary>

‎Clojure/Clojure/Lib/APersistentVector.cs‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract class APersistentVector: AFn, IPersistentVector, IList, ICompara
2929
/// <summary>
3030
/// Caches the hash code, once computed.
3131
/// </summary>
32-
int _hash;
32+
//int _hash;
3333

3434
/// <summary>
3535
/// Caches the hashseq code, when computed.
@@ -127,18 +127,19 @@ static public bool doEquals(IPersistentVector v, object obj)
127127
/// <returns>A hash code for the current object.</returns>
128128
public override int GetHashCode()
129129
{
130-
int hash = _hash;
131-
if (hash == 0)
132-
{
133-
hash = 1;
134-
for (int i = 0; i < count(); i++)
135-
{
136-
Object obj = nth(i);
137-
hash = 31 * hash + (obj == null ? 0 : obj.GetHashCode());
138-
}
139-
this._hash = hash;
140-
}
141-
return hash;
130+
return hasheq();
131+
//int hash = _hash;
132+
//if (hash == 0)
133+
//{
134+
// hash = 1;
135+
// for (int i = 0; i < count(); i++)
136+
// {
137+
// Object obj = nth(i);
138+
// hash = 31 * hash + (obj == null ? 0 : obj.GetHashCode());
139+
// }
140+
// this._hash = hash;
141+
//}
142+
//return hash;
142143
}
143144

144145

‎Clojure/Clojure/Lib/ASeq.cs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,16 @@ public override bool Equals(object obj)
104104
/// <returns>A hash code for the current object.</returns>
105105
/// <remarks>The hash code is cached after it is computed the first time. The hash code depends on the value (sequenc of items).</remarks>
106106
public override int GetHashCode()
107-
{
108-
if ( _hash == 0 )
109-
{
110-
int h = 1;
111-
for (ISeq s = seq(); s != null; s = s.next())
112-
h = 31 * h + (s.first() == null ? 0 : s.first().GetHashCode());
113-
_hash = h;
114-
}
115-
return _hash;
107+
{
108+
return hasheq();
109+
//if ( _hash == 0 )
110+
//{
111+
// int h = 1;
112+
// for (ISeq s = seq(); s != null; s = s.next())
113+
// h = 31 * h + (s.first() == null ? 0 : s.first().GetHashCode());
114+
// _hash = h;
115+
//}
116+
//return _hash;
116117
}
117118

118119
#endregion

‎Clojure/Clojure/Lib/Keyword.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ public override bool Equals(object obj)
164164
/// <returns>A hash code.</returns>
165165
public override int GetHashCode()
166166
{
167-
return (int)(_sym.GetHashCode() + 0x9e3779b9);
167+
return _hasheq;
168+
//return (int)(_sym.GetHashCode() + 0x9e3779b9);
168169
}
169170

170171
#endregion

‎Clojure/Clojure/Lib/PersistentList.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,8 @@ public EmptyList(IPersistentMap meta)
326326
/// <returns>The hash code</returns>
327327
public override int GetHashCode()
328328
{
329-
return 1;
329+
return _hasheq;
330+
// return 1;
330331
}
331332

332333
/// <summary>

0 commit comments

Comments
 (0)