put back update defalg after bootstrapping (ugly)

JuliaLang · Feb 22, 2022 · e61902f · e61902f
1 parent 447300b
commit e61902f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/base/Base.jl b/base/Base.jl
@@ -398,6 +398,11 @@ include("util.jl")
 
 include("asyncmap.jl")
 
+Sort.defalg(v::AbstractArray) = DEFAULT_STABLE
+Sort.defalg(v::AbstractArray{<:Union{Number, Missing}}) = DEFAULT_UNSTABLE
+Sort.defalg(v::AbstractArray{Missing}) = DEFAULT_UNSTABLE
+Sort.defalg(v::AbstractArray{Union{}}) = DEFAULT_UNSTABLE
+
 # deprecated functions
 include("deprecated.jl")
 

diff --git a/base/sort.jl b/base/sort.jl
@@ -512,8 +512,8 @@ Characteristics:
 """
 const MergeSort     = MergeSortAlg()
 
-const DEFAULT_UNSTABLE = QuickSort
-const DEFAULT_STABLE   = MergeSort
+const DEFAULT_UNSTABLE = RadixSort(QuickSort)
+const DEFAULT_STABLE   = RadixSort(MergeSort)
 const SMALL_ALGORITHM  = InsertionSort
 const SMALL_THRESHOLD  = 20
 
@@ -751,10 +751,10 @@ end
 
 ## generic sorting methods ##
 
-defalg(v::AbstractArray) = DEFAULT_STABLE
-defalg(v::AbstractArray{<:Union{Number, Missing}}) = DEFAULT_UNSTABLE
-defalg(v::AbstractArray{Missing}) = DEFAULT_UNSTABLE
-defalg(v::AbstractArray{Union{}}) = DEFAULT_UNSTABLE
+defalg(v::AbstractArray) = MergeSort
+defalg(v::AbstractArray{<:Union{Number, Missing}}) = QuickSort
+defalg(v::AbstractArray{Missing}) = QuickSort
+defalg(v::AbstractArray{Union{}}) = QuickSort
 
 function sort!(v::AbstractVector, alg::Algorithm, order::Ordering)
     inds = axes(v,1)