Skip to content

Commit 12411fc

Browse files
authored
Fix broken inheritance from DataFrameColumn class (#7324)
1 parent a4c67fe commit 12411fc

5 files changed

+5
-5
lines changed

src/Microsoft.Data.Analysis/DataFrameColumn.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ public string ToString(long rowsToShow)
460460
/// </summary>
461461
/// <param name="ascending">Sorting order.</param>
462462
/// <param name="putNullValuesLast">If true, null values are always put at the end.</param>
463-
internal abstract PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending, bool putNullValuesLast);
463+
protected internal abstract PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending, bool putNullValuesLast);
464464

465465
protected delegate long GetBufferSortIndex(int bufferIndex, int sortIndex);
466466
protected delegate ValueTuple<T, int> GetValueAndBufferSortIndexAtBuffer<T>(int bufferIndex, int valueIndex);

src/Microsoft.Data.Analysis/DataFrameColumns/ArrowStringDataFrameColumn.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ protected internal override Apache.Arrow.Array ToArrowArray(long startIndex, int
363363
return new StringArray(numberOfRows, offsetsBuffer, dataBuffer, nullBuffer, nullCount, indexInBuffer);
364364
}
365365

366-
internal override PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending, bool putNullValuesLast) => throw new NotSupportedException();
366+
protected internal override PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending, bool putNullValuesLast) => throw new NotSupportedException();
367367

368368
public new ArrowStringDataFrameColumn Clone(long numberOfNullsToAppend = 0)
369369
{

src/Microsoft.Data.Analysis/DataFrameColumns/StringDataFrameColumn.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public IEnumerator<string> GetEnumerator()
202202
return (StringDataFrameColumn)base.Sort(ascending, putNullValuesLast);
203203
}
204204

205-
internal override PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending, bool putNullValuesLast)
205+
protected internal override PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending, bool putNullValuesLast)
206206
{
207207
var comparer = Comparer<string>.Default;
208208

src/Microsoft.Data.Analysis/DataFrameColumns/VBufferDataFrameColumn.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,6 @@ protected override DataFrameColumn DropNullsImplementation()
384384
return Clone();
385385
}
386386

387-
internal override PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending, bool putNullValuesLast) => throw new NotImplementedException();
387+
protected internal override PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending, bool putNullValuesLast) => throw new NotImplementedException();
388388
}
389389
}

src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.Sort.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public partial class PrimitiveDataFrameColumn<T> : DataFrameColumn
1818
return (PrimitiveDataFrameColumn<T>)base.Sort(ascending, putNullValuesLast);
1919
}
2020

21-
internal override PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending = true, bool putNullValuesLast = true)
21+
protected internal override PrimitiveDataFrameColumn<long> GetSortIndices(bool ascending = true, bool putNullValuesLast = true)
2222
{
2323
var comparer = Comparer<T>.Default;
2424

0 commit comments

Comments
 (0)