Skip to content

Commit 94caa4d

Browse files
inmeminmem
committed
Upgrades with news NETStandard.Library 2.0.2 - FcsKeyFastBTreeN and FcsInmemStream are serialized by binary formatting
1 parent 9598a9e commit 94caa4d

File tree

18 files changed

+786
-464
lines changed

18 files changed

+786
-464
lines changed

‎FriendlyCSharp.Databases/BTreeN/FcsBTreeN.cs‎

Lines changed: 61 additions & 61 deletions
Large diffs are not rendered by default.

‎FriendlyCSharp.Databases/BTreeN/FcsDuplValueFastBTreeN.cs‎

Lines changed: 78 additions & 78 deletions
Large diffs are not rendered by default.

‎FriendlyCSharp.Databases/BTreeN/FcsFastBTreeN.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected FcsFastBTreeN(int btnBTreeN, uint allocIdxFast, object objCmp) : base(
3535
return _BtnFind(ref key, out value, _btnRoot, out _btnKVFast[idxFast]);
3636
}
3737
//////////////////////////
38-
protected virtual bool? BtnFastFind(TKey key, out TValue value, out BtnFastKeyValue btnFast)
38+
protected virtual bool? BtnFastFind(TKey key, out TValue value, out KeyValueFast btnFast)
3939
{
4040
return _BtnFind(ref key, out value, _btnRoot, out btnFast);
4141
}
@@ -66,7 +66,7 @@ public virtual (TKey key, TValue value)? BtnFastFind(TKey key, uint idxFast)
6666
return _BtnFirst(out key, out value, out _btnKVFast[idxFast]);
6767
}
6868
//////////////////////////
69-
protected virtual bool? BtnFastFirst(out TKey key, out TValue value, out BtnFastKeyValue btnFast)
69+
protected virtual bool? BtnFastFirst(out TKey key, out TValue value, out KeyValueFast btnFast)
7070
{
7171
return _BtnFirst(out key, out value, out btnFast);
7272
}
@@ -90,7 +90,7 @@ public virtual (TKey key, TValue value)? BtnFastFirst(uint idxFast)
9090
return _BtnLast(out key, out value, out _btnKVFast[idxFast]);
9191
}
9292
//////////////////////////
93-
protected virtual bool? BtnFastLast(out TKey key, out TValue value, out BtnFastKeyValue btnFast)
93+
protected virtual bool? BtnFastLast(out TKey key, out TValue value, out KeyValueFast btnFast)
9494
{
9595
return _BtnLast(out key, out value, out btnFast);
9696
}
@@ -112,7 +112,7 @@ public virtual (TKey key, TValue value)? BtnFastLast(uint idxFast)
112112
public virtual bool? BtnFastNext(ref TKey key, out TValue value, uint idxFast)
113113
{
114114
int middle = _btnKVFast[idxFast].fastMiddle;
115-
BtnFastKeyValue btnFast = _btnKVFast[idxFast];
115+
KeyValueFast btnFast = _btnKVFast[idxFast];
116116
if ( (btnFast.version == BtnVersion) && (btnFast.fastPage != null) && (middle > 0) &&
117117
(middle < btnFast.fastPage.iDataCount) && (BtnCompares(key, btnFast.fastPage.aData[middle].key, _objCompares) == 0))
118118
{
@@ -128,7 +128,7 @@ public virtual (TKey key, TValue value)? BtnFastLast(uint idxFast)
128128
}
129129
}
130130
//////////////////////////
131-
protected virtual bool? BtnFastNext(ref TKey key, out TValue value, ref BtnFastKeyValue btnFast)
131+
protected virtual bool? BtnFastNext(ref TKey key, out TValue value, ref KeyValueFast btnFast)
132132
{
133133
int middle = btnFast.fastMiddle;
134134
if ( (btnFast.version == BtnVersion) && (btnFast.fastPage != null) && (middle > 0) &&
@@ -150,7 +150,7 @@ public virtual (TKey key, TValue value)? BtnFastLast(uint idxFast)
150150
public virtual KeyValuePair<TKey, TValue>? BtnFastNext(TKey key, uint idxFast)
151151
{
152152
int middle = _btnKVFast[idxFast].fastMiddle;
153-
BtnFastKeyValue btnFast = _btnKVFast[idxFast];
153+
KeyValueFast btnFast = _btnKVFast[idxFast];
154154
if ( (btnFast.version == BtnVersion) && (btnFast.fastPage != null) && (middle > 0) &&
155155
(middle < btnFast.fastPage.iDataCount) && (BtnCompares(key, btnFast.fastPage.aData[middle].key, _objCompares) == 0))
156156
{
@@ -193,7 +193,7 @@ public virtual (TKey key, TValue value)? BtnFastNext(TKey key, uint idxFast)
193193
public virtual bool? BtnFastPrev(ref TKey key, out TValue value, uint idxFast)
194194
{
195195
int middle = _btnKVFast[idxFast].fastMiddle;
196-
BtnFastKeyValue btnFast = _btnKVFast[idxFast];
196+
KeyValueFast btnFast = _btnKVFast[idxFast];
197197
if ( (btnFast.version == BtnVersion) && (btnFast.fastPage != null) && (middle > 1) &&
198198
(middle <= btnFast.fastPage.iDataCount) && (BtnCompares(key, btnFast.fastPage.aData[middle].key, _objCompares) == 0) )
199199
{
@@ -209,7 +209,7 @@ public virtual (TKey key, TValue value)? BtnFastNext(TKey key, uint idxFast)
209209
}
210210
}
211211
//////////////////////////
212-
protected virtual bool? BtnFastPrev(ref TKey key, out TValue value, ref BtnFastKeyValue btnFast)
212+
protected virtual bool? BtnFastPrev(ref TKey key, out TValue value, ref KeyValueFast btnFast)
213213
{
214214
int middle = btnFast.fastMiddle;
215215
if ( (btnFast.version == BtnVersion) && (btnFast.fastPage != null) && (middle > 1) &&
@@ -231,7 +231,7 @@ public virtual (TKey key, TValue value)? BtnFastNext(TKey key, uint idxFast)
231231
public virtual KeyValuePair<TKey, TValue>? BtnFastPrev(TKey key, uint idxFast)
232232
{
233233
int middle = _btnKVFast[idxFast].fastMiddle;
234-
BtnFastKeyValue btnFast = _btnKVFast[idxFast];
234+
KeyValueFast btnFast = _btnKVFast[idxFast];
235235
if ( (btnFast.version == BtnVersion) && (btnFast.fastPage != null) && (middle > 1) &&
236236
(middle <= btnFast.fastPage.iDataCount) && (BtnCompares(key, btnFast.fastPage.aData[middle].key, _objCompares) == 0))
237237
{
@@ -277,7 +277,7 @@ public virtual (TKey key, TValue value)? BtnFastPrev(TKey key, uint idxFast)
277277
return _BtnSearch(ref key, out value, _btnRoot, ref bNext, out _btnKVFast[idxFast]);
278278
}
279279
//////////////////////////
280-
protected virtual bool? BtnFastSearch(ref TKey key, out TValue value, out BtnFastKeyValue btnFast)
280+
protected virtual bool? BtnFastSearch(ref TKey key, out TValue value, out KeyValueFast btnFast)
281281
{
282282
bool bNext = false;
283283
return _BtnSearch(ref key, out value, _btnRoot, ref bNext, out btnFast);
@@ -311,7 +311,7 @@ public virtual (TKey key, TValue value)? BtnFastSearch(TKey key, uint idxFast)
311311
return _BtnSearchPrev(ref key, out value, _btnRoot, ref bNext, out _btnKVFast[idxFast]);
312312
}
313313
//////////////////////////
314-
protected virtual bool? BtnFastSearchPrev(ref TKey key, out TValue value, out BtnFastKeyValue btnFast)
314+
protected virtual bool? BtnFastSearchPrev(ref TKey key, out TValue value, out KeyValueFast btnFast)
315315
{
316316
bool bNext = false;
317317
return _BtnSearchPrev(ref key, out value, _btnRoot, ref bNext, out btnFast);
@@ -377,7 +377,7 @@ public class BtnEnumeratorFast : IEnumerator<KeyValuePair<TKey, TValue>?>
377377
private TKey _key;
378378
private TValue _value;
379379
private int _count;
380-
private BtnFastKeyValue _btnFast;
380+
private KeyValueFast _btnFast;
381381
//////////////////////////
382382
public BtnEnumeratorFast(FcsFastBTreeN<TKey, TValue> btn, TKey? keyLo, TKey? keyHi, bool reverse, int maxCount)
383383
{
@@ -398,7 +398,7 @@ public bool MoveNext()
398398

399399
if (_btnFast.version == int.MinValue)
400400
{
401-
_btnFast = default(BtnFastKeyValue);
401+
_btnFast = default(KeyValueFast);
402402
if ((_keyLo == null) && (!_reverse))
403403
_bOK = (_btn.BtnFastFirst(out _key, out _value, out _btnFast) != null);
404404
else if ((_keyHi == null) && (_reverse))
@@ -465,7 +465,7 @@ public void Reset()
465465
{
466466
_count = _maxCount;
467467
_bOK = true;
468-
_btnFast = default(BtnFastKeyValue);
468+
_btnFast = default(KeyValueFast);
469469
_btnFast.version = int.MinValue;
470470
}
471471
}

‎FriendlyCSharp.Databases/BTreeN/FcsFastLockBTreeN.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public override (TKey key, TValue value)? BtnFind(TKey key)
7171
return base.BtnFastFind(key, out value, idxFast);
7272
}
7373
//////////////////////////
74-
protected override bool? BtnFastFind(TKey key, out TValue value, out BtnFastKeyValue btnFast)
74+
protected override bool? BtnFastFind(TKey key, out TValue value, out KeyValueFast btnFast)
7575
{
7676
lock (_btnLock)
7777
return base.BtnFastFind(key, out value, out btnFast);
@@ -119,7 +119,7 @@ public override (TKey key, TValue value)? BtnFirst()
119119
return base.BtnFastFirst(out key, out value, idxFast);
120120
}
121121
//////////////////////////
122-
protected override bool? BtnFastFirst(out TKey key, out TValue value, out BtnFastKeyValue btnFast)
122+
protected override bool? BtnFastFirst(out TKey key, out TValue value, out KeyValueFast btnFast)
123123
{
124124
lock (_btnLock)
125125
return base.BtnFastFirst(out key, out value, out btnFast);
@@ -167,7 +167,7 @@ public override (TKey key, TValue value)? BtnLast()
167167
return base.BtnFastLast(out key, out value, idxFast);
168168
}
169169
//////////////////////////
170-
protected override bool? BtnFastLast(out TKey key, out TValue value, out BtnFastKeyValue btnFast)
170+
protected override bool? BtnFastLast(out TKey key, out TValue value, out KeyValueFast btnFast)
171171
{
172172
lock (_btnLock)
173173
return base.BtnFastLast(out key, out value, out btnFast);
@@ -230,7 +230,7 @@ public override (TKey key, TValue value)? BtnNext(TKey key)
230230
return base.BtnFastNext(ref key, out value, idxFast);
231231
}
232232
//////////////////////////
233-
protected override bool? BtnFastNext(ref TKey key, out TValue value, ref BtnFastKeyValue btnFast)
233+
protected override bool? BtnFastNext(ref TKey key, out TValue value, ref KeyValueFast btnFast)
234234
{
235235
lock (_btnLock)
236236
return base.BtnFastNext(ref key, out value, ref btnFast);
@@ -293,7 +293,7 @@ public override (TKey key, TValue value)? BtnPrev(TKey key)
293293
return base.BtnFastPrev(ref key, out value, idxFast);
294294
}
295295
//////////////////////////
296-
protected override bool? BtnFastPrev(ref TKey key, out TValue value, ref BtnFastKeyValue btnFast)
296+
protected override bool? BtnFastPrev(ref TKey key, out TValue value, ref KeyValueFast btnFast)
297297
{
298298
lock (_btnLock)
299299
return base.BtnFastPrev(ref key, out value, ref btnFast);
@@ -354,7 +354,7 @@ public override (TKey key, TValue value)? BtnSearch(TKey key)
354354
return base.BtnFastSearch(ref key, out value, idxFast);
355355
}
356356
//////////////////////////
357-
protected override bool? BtnFastSearch(ref TKey key, out TValue value, out BtnFastKeyValue btnFast)
357+
protected override bool? BtnFastSearch(ref TKey key, out TValue value, out KeyValueFast btnFast)
358358
{
359359
lock (_btnLock)
360360
return base.BtnFastSearch(ref key, out value, out btnFast);
@@ -415,7 +415,7 @@ public override (TKey key, TValue value)? BtnSearchPrev(TKey key)
415415
return base.BtnFastSearchPrev(ref key, out value, idxFast);
416416
}
417417
//////////////////////////
418-
protected override bool? BtnFastSearchPrev(ref TKey key, out TValue value, out BtnFastKeyValue btnFast)
418+
protected override bool? BtnFastSearchPrev(ref TKey key, out TValue value, out KeyValueFast btnFast)
419419
{
420420
lock (_btnLock)
421421
return base.BtnFastSearchPrev(ref key, out value, out btnFast);

0 commit comments

Comments
 (0)