From 798bde946ed843c7551ff6dddf6c3cf182dc9803 Mon Sep 17 00:00:00 2001 From: Aleksei Smirnov Date: Thu, 21 Nov 2024 00:41:03 +0300 Subject: [PATCH] Fix broken inheritance from DataFrameColumn class --- src/Microsoft.Data.Analysis/DataFrameColumn.cs | 2 +- .../DataFrameColumns/ArrowStringDataFrameColumn.cs | 2 +- .../DataFrameColumns/StringDataFrameColumn.cs | 2 +- .../DataFrameColumns/VBufferDataFrameColumn.cs | 2 +- src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.Sort.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.Data.Analysis/DataFrameColumn.cs b/src/Microsoft.Data.Analysis/DataFrameColumn.cs index e360053dcc..b88ffc93d7 100644 --- a/src/Microsoft.Data.Analysis/DataFrameColumn.cs +++ b/src/Microsoft.Data.Analysis/DataFrameColumn.cs @@ -460,7 +460,7 @@ public string ToString(long rowsToShow) /// /// Sorting order. /// If true, null values are always put at the end. - internal abstract PrimitiveDataFrameColumn GetSortIndices(bool ascending, bool putNullValuesLast); + protected internal abstract PrimitiveDataFrameColumn GetSortIndices(bool ascending, bool putNullValuesLast); protected delegate long GetBufferSortIndex(int bufferIndex, int sortIndex); protected delegate ValueTuple GetValueAndBufferSortIndexAtBuffer(int bufferIndex, int valueIndex); diff --git a/src/Microsoft.Data.Analysis/DataFrameColumns/ArrowStringDataFrameColumn.cs b/src/Microsoft.Data.Analysis/DataFrameColumns/ArrowStringDataFrameColumn.cs index 80b32b0421..a6280dd78a 100644 --- a/src/Microsoft.Data.Analysis/DataFrameColumns/ArrowStringDataFrameColumn.cs +++ b/src/Microsoft.Data.Analysis/DataFrameColumns/ArrowStringDataFrameColumn.cs @@ -363,7 +363,7 @@ protected internal override Apache.Arrow.Array ToArrowArray(long startIndex, int return new StringArray(numberOfRows, offsetsBuffer, dataBuffer, nullBuffer, nullCount, indexInBuffer); } - internal override PrimitiveDataFrameColumn GetSortIndices(bool ascending, bool putNullValuesLast) => throw new NotSupportedException(); + protected internal override PrimitiveDataFrameColumn GetSortIndices(bool ascending, bool putNullValuesLast) => throw new NotSupportedException(); public new ArrowStringDataFrameColumn Clone(long numberOfNullsToAppend = 0) { diff --git a/src/Microsoft.Data.Analysis/DataFrameColumns/StringDataFrameColumn.cs b/src/Microsoft.Data.Analysis/DataFrameColumns/StringDataFrameColumn.cs index 47e2ae6bda..fb11576311 100644 --- a/src/Microsoft.Data.Analysis/DataFrameColumns/StringDataFrameColumn.cs +++ b/src/Microsoft.Data.Analysis/DataFrameColumns/StringDataFrameColumn.cs @@ -202,7 +202,7 @@ public IEnumerator GetEnumerator() return (StringDataFrameColumn)base.Sort(ascending, putNullValuesLast); } - internal override PrimitiveDataFrameColumn GetSortIndices(bool ascending, bool putNullValuesLast) + protected internal override PrimitiveDataFrameColumn GetSortIndices(bool ascending, bool putNullValuesLast) { var comparer = Comparer.Default; diff --git a/src/Microsoft.Data.Analysis/DataFrameColumns/VBufferDataFrameColumn.cs b/src/Microsoft.Data.Analysis/DataFrameColumns/VBufferDataFrameColumn.cs index c6be2e6b57..7b3c0d49a3 100644 --- a/src/Microsoft.Data.Analysis/DataFrameColumns/VBufferDataFrameColumn.cs +++ b/src/Microsoft.Data.Analysis/DataFrameColumns/VBufferDataFrameColumn.cs @@ -384,6 +384,6 @@ protected override DataFrameColumn DropNullsImplementation() return Clone(); } - internal override PrimitiveDataFrameColumn GetSortIndices(bool ascending, bool putNullValuesLast) => throw new NotImplementedException(); + protected internal override PrimitiveDataFrameColumn GetSortIndices(bool ascending, bool putNullValuesLast) => throw new NotImplementedException(); } } diff --git a/src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.Sort.cs b/src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.Sort.cs index 9845c48ef6..6cc7aa4b97 100644 --- a/src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.Sort.cs +++ b/src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.Sort.cs @@ -18,7 +18,7 @@ public partial class PrimitiveDataFrameColumn : DataFrameColumn return (PrimitiveDataFrameColumn)base.Sort(ascending, putNullValuesLast); } - internal override PrimitiveDataFrameColumn GetSortIndices(bool ascending = true, bool putNullValuesLast = true) + protected internal override PrimitiveDataFrameColumn GetSortIndices(bool ascending = true, bool putNullValuesLast = true) { var comparer = Comparer.Default;