perf: improve sort algorithm (#2756)

* perf: improve sort algorithm

* benchmark: add headers-length32.mjs

* fix: benchmark

* fix: fix performance regression for sorted arrays

* test: add sorted test

* refactor: simplify

* refactor: remove comment

Author: tsctx

benchmarks/cacheGetFieldValues.mjs

@@ -1,5 +1,5 @@
 import { bench, group, run } from 'mitata'
-import { getFieldValues } from '../lib/cache/util.js'
+import { getFieldValues } from '../lib/web/cache/util.js'
 
 const values = [
   '',

benchmarks/headers-length32.mjs

@@ -0,0 +1,56 @@
+import { bench, run } from 'mitata'
+import { Headers } from '../lib/fetch/headers.js'
+
+const headers = new Headers(
+  [
+    'Origin-Agent-Cluster',
+    'RTT',
+    'Accept-CH-Lifetime',
+    'X-Frame-Options',
+    'Sec-CH-UA-Platform-Version',
+    'Digest',
+    'Cache-Control',
+    'Sec-CH-UA-Platform',
+    'If-Range',
+    'SourceMap',
+    'Strict-Transport-Security',
+    'Want-Digest',
+    'Cross-Origin-Resource-Policy',
+    'Width',
+    'Accept-CH',
+    'Via',
+    'Refresh',
+    'Server',
+    'Sec-Fetch-Dest',
+    'Sec-CH-UA-Model',
+    'Access-Control-Request-Method',
+    'Access-Control-Request-Headers',
+    'Date',
+    'Expires',
+    'DNT',
+    'Proxy-Authorization',
+    'Alt-Svc',
+    'Alt-Used',
+    'ETag',
+    'Sec-Fetch-User',
+    'Sec-CH-UA-Full-Version-List',
+    'Referrer-Policy'
+  ].map((v) => [v, ''])
+)
+
+const kHeadersList = Reflect.ownKeys(headers).find(
+  (c) => String(c) === 'Symbol(headers list)'
+)
+
+const headersList = headers[kHeadersList]
+
+const kHeadersSortedMap = Reflect.ownKeys(headersList).find(
+  (c) => String(c) === 'Symbol(headers map sorted)'
+)
+
+bench('Headers@@iterator', () => {
+  headersList[kHeadersSortedMap] = null
+  return [...headers]
+})
+
+await run()

benchmarks/headers.mjs

@@ -0,0 +1,57 @@
+import { bench, group, run } from 'mitata'
+import { Headers } from '../lib/fetch/headers.js'
+
+const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+const charactersLength = characters.length
+
+function generateAsciiString (length) {
+  let result = ''
+  for (let i = 0; i < length; ++i) {
+    result += characters[Math.floor(Math.random() * charactersLength)]
+  }
+  return result
+}
+
+const settings = {
+  'fast-path (tiny array)': 4,
+  'fast-path (small array)': 8,
+  'fast-path (middle array)': 16,
+  'fast-path': 32,
+  'slow-path': 64
+}
+
+for (const [name, length] of Object.entries(settings)) {
+  const headers = new Headers(
+    Array.from(Array(length), () => [generateAsciiString(12), ''])
+  )
+
+  const headersSorted = new Headers(headers)
+
+  const kHeadersList = Reflect.ownKeys(headers).find(
+    (c) => String(c) === 'Symbol(headers list)'
+  )
+
+  const headersList = headers[kHeadersList]
+
+  const headersListSorted = headersSorted[kHeadersList]
+
+  const kHeadersSortedMap = Reflect.ownKeys(headersList).find(
+    (c) => String(c) === 'Symbol(headers map sorted)'
+  )
+
+  group(`length ${length} #${name}`, () => {
+    bench('Headers@@iterator', () => {
+      // prevention of memoization of results
+      headersList[kHeadersSortedMap] = null
+      return [...headers]
+    })
+
+    bench('Headers@@iterator (sorted)', () => {
+      // prevention of memoization of results
+      headersListSorted[kHeadersSortedMap] = null
+      return [...headersSorted]
+    })
+  })
+}
+
+await run()

benchmarks/sort.mjs

@@ -0,0 +1,50 @@
+import { bench, group, run } from 'mitata'
+import { sort, heapSort, introSort } from '../lib/fetch/sort.js'
+
+function compare (a, b) {
+  return a < b ? -1 : 1
+}
+
+const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+const charactersLength = characters.length
+
+function generateAsciiString (length) {
+  let result = ''
+  for (let i = 0; i < length; ++i) {
+    result += characters[Math.floor(Math.random() * charactersLength)]
+  }
+  return result
+}
+
+const settings = {
+  tiny: 32,
+  small: 64,
+  middle: 128,
+  large: 512
+}
+
+for (const [name, length] of Object.entries(settings)) {
+  group(`sort (${name})`, () => {
+    const array = Array.from(new Array(length), () => generateAsciiString(12))
+    // sort(array, compare)
+    bench('Array#sort', () => array.slice().sort(compare))
+    bench('sort (intro sort)', () => sort(array.slice(), compare))
+
+    // sort(array, start, end, compare)
+    bench('intro sort', () => introSort(array.slice(), 0, array.length, compare))
+    bench('heap sort', () => heapSort(array.slice(), 0, array.length, compare))
+  })
+
+  group(`sort sortedArray (${name})`, () => {
+    const array = Array.from(new Array(length), () => generateAsciiString(12)).sort(compare)
+    // sort(array, compare)
+    bench('Array#sort', () => array.sort(compare))
+    bench('sort (intro sort)', () => sort(array, compare))
+
+    // sort(array, start, end, compare)
+    bench('intro sort', () => introSort(array, 0, array.length, compare))
+    bench('heap sort', () => heapSort(array, 0, array.length, compare))
+  })
+}
+
+await run()

index-fetch.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const fetchImpl = require('./lib/fetch').fetch
+const fetchImpl = require('./lib/web/fetch').fetch
 
 module.exports.fetch = function fetch (resource, init = undefined) {
   return fetchImpl(resource, init).catch((err) => {
@@ -10,12 +10,12 @@ module.exports.fetch = function fetch (resource, init = undefined) {
     throw err
   })
 }
-module.exports.FormData = require('./lib/fetch/formdata').FormData
-module.exports.Headers = require('./lib/fetch/headers').Headers
-module.exports.Response = require('./lib/fetch/response').Response
-module.exports.Request = require('./lib/fetch/request').Request
+module.exports.FormData = require('./lib/web/fetch/formdata').FormData
+module.exports.Headers = require('./lib/web/fetch/headers').Headers
+module.exports.Response = require('./lib/web/fetch/response').Response
+module.exports.Request = require('./lib/web/fetch/request').Request
 
-module.exports.WebSocket = require('./lib/websocket/websocket').WebSocket
-module.exports.MessageEvent = require('./lib/websocket/events').MessageEvent
+module.exports.WebSocket = require('./lib/web/websocket/websocket').WebSocket
+module.exports.MessageEvent = require('./lib/web/websocket/events').MessageEvent
 
-module.exports.EventSource = require('./lib/eventsource/eventsource').EventSource
+module.exports.EventSource = require('./lib/web/eventsource/eventsource').EventSource

index.js

@@ -96,7 +96,7 @@ function makeDispatcher (fn) {
 module.exports.setGlobalDispatcher = setGlobalDispatcher
 module.exports.getGlobalDispatcher = getGlobalDispatcher
 
-const fetchImpl = require('./lib/fetch').fetch
+const fetchImpl = require('./lib/web/fetch').fetch
 module.exports.fetch = async function fetch (init, options = undefined) {
   try {
     return await fetchImpl(init, options)
@@ -108,39 +108,39 @@ module.exports.fetch = async function fetch (init, options = undefined) {
     throw err
   }
 }
-module.exports.Headers = require('./lib/fetch/headers').Headers
-module.exports.Response = require('./lib/fetch/response').Response
-module.exports.Request = require('./lib/fetch/request').Request
-module.exports.FormData = require('./lib/fetch/formdata').FormData
-module.exports.File = require('./lib/fetch/file').File
-module.exports.FileReader = require('./lib/fileapi/filereader').FileReader
+module.exports.Headers = require('./lib/web/fetch/headers').Headers
+module.exports.Response = require('./lib/web/fetch/response').Response
+module.exports.Request = require('./lib/web/fetch/request').Request
+module.exports.FormData = require('./lib/web/fetch/formdata').FormData
+module.exports.File = require('./lib/web/fetch/file').File
+module.exports.FileReader = require('./lib/web/fileapi/filereader').FileReader
 
-const { setGlobalOrigin, getGlobalOrigin } = require('./lib/fetch/global')
+const { setGlobalOrigin, getGlobalOrigin } = require('./lib/web/fetch/global')
 
 module.exports.setGlobalOrigin = setGlobalOrigin
 module.exports.getGlobalOrigin = getGlobalOrigin
 
-const { CacheStorage } = require('./lib/cache/cachestorage')
-const { kConstruct } = require('./lib/cache/symbols')
+const { CacheStorage } = require('./lib/web/cache/cachestorage')
+const { kConstruct } = require('./lib/web/cache/symbols')
 
 // Cache & CacheStorage are tightly coupled with fetch. Even if it may run
 // in an older version of Node, it doesn't have any use without fetch.
 module.exports.caches = new CacheStorage(kConstruct)
 
-const { deleteCookie, getCookies, getSetCookies, setCookie } = require('./lib/cookies')
+const { deleteCookie, getCookies, getSetCookies, setCookie } = require('./lib/web/cookies')
 
 module.exports.deleteCookie = deleteCookie
 module.exports.getCookies = getCookies
 module.exports.getSetCookies = getSetCookies
 module.exports.setCookie = setCookie
 
-const { parseMIMEType, serializeAMimeType } = require('./lib/fetch/dataURL')
+const { parseMIMEType, serializeAMimeType } = require('./lib/web/fetch/dataURL')
 
 module.exports.parseMIMEType = parseMIMEType
 module.exports.serializeAMimeType = serializeAMimeType
 
-const { CloseEvent, ErrorEvent, MessageEvent } = require('./lib/websocket/events')
-module.exports.WebSocket = require('./lib/websocket/websocket').WebSocket
+const { CloseEvent, ErrorEvent, MessageEvent } = require('./lib/web/websocket/events')
+module.exports.WebSocket = require('./lib/web/websocket/websocket').WebSocket
 module.exports.CloseEvent = CloseEvent
 module.exports.ErrorEvent = ErrorEvent
 module.exports.MessageEvent = MessageEvent
@@ -156,6 +156,6 @@ module.exports.MockPool = MockPool
 module.exports.MockAgent = MockAgent
 module.exports.mockErrors = mockErrors
 
-const { EventSource } = require('./lib/eventsource/eventsource')
+const { EventSource } = require('./lib/web/eventsource/eventsource')
 
 module.exports.EventSource = EventSource

lib/cache/symbols.js

@@ -1500,7 +1500,7 @@ function write (client, request) {
 
   if (util.isFormDataLike(body)) {
     if (!extractBody) {
-      extractBody = require('./fetch/body.js').extractBody
+      extractBody = require('./web/fetch/body.js').extractBody
     }
 
     const [bodyStream, contentType] = extractBody(body)

lib/client.js

@@ -74,7 +74,7 @@ class MockInterceptor {
       if (opts.query) {
         opts.path = buildURL(opts.path, opts.query)
       } else {
-        // Matches https://github.com/nodejs/undici/blob/main/lib/fetch/index.js#L1811
+        // Matches https://github.com/nodejs/undici/blob/main/lib/web/fetch/index.js#L1811
         const parsedURL = new URL(opts.path, 'data://')
         opts.path = parsedURL.pathname + parsedURL.search
       }

lib/mock/mock-interceptor.js

@@ -2,15 +2,15 @@
 
 const { kConstruct } = require('./symbols')
 const { urlEquals, getFieldValues } = require('./util')
-const { kEnumerableProperty, isDisturbed } = require('../core/util')
+const { kEnumerableProperty, isDisturbed } = require('../../core/util')
 const { webidl } = require('../fetch/webidl')
 const { Response, cloneResponse, fromInnerResponse } = require('../fetch/response')
 const { Request, fromInnerRequest } = require('../fetch/request')
 const { kState } = require('../fetch/symbols')
 const { fetching } = require('../fetch/index')
 const { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require('../fetch/util')
 const assert = require('node:assert')
-const { getGlobalDispatcher } = require('../global')
+const { getGlobalDispatcher } = require('../../global')
 
 /**
  * @see https://w3c.github.io/ServiceWorker/#dfn-cache-batch-operation

lib/cache/cache.js lib/web/cache/cache.js

@@ -3,7 +3,7 @@
 const { kConstruct } = require('./symbols')
 const { Cache } = require('./cache')
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 
 class CacheStorage {
   /**

lib/cache/cachestorage.js lib/web/cache/cachestorage.js

@@ -0,0 +1,5 @@
+'use strict'
+
+module.exports = {
+  kConstruct: require('../../core/symbols').kConstruct
+}

lib/web/cache/symbols.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const assert = require('node:assert')
-const { kHeadersList } = require('../core/symbols')
+const { kHeadersList } = require('../../core/symbols')
 
 function isCTLExcludingHtab (value) {
   if (value.length === 0) {

lib/cache/util.js lib/web/cache/util.js

@@ -9,7 +9,7 @@ const { EventSourceStream } = require('./eventsource-stream')
 const { parseMIMEType } = require('../fetch/dataURL')
 const { MessageEvent } = require('../websocket/events')
 const { isNetworkError } = require('../fetch/response')
-const { getGlobalDispatcher } = require('../global')
+const { getGlobalDispatcher } = require('../../global')
 const { delay } = require('./util')
 
 let experimentalWarned = false

lib/cookies/constants.js lib/web/cookies/constants.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Busboy = require('@fastify/busboy')
-const util = require('../core/util')
+const util = require('../../core/util')
 const {
   ReadableStreamFrom,
   isBlobLike,
@@ -16,7 +16,7 @@ const { kState } = require('./symbols')
 const { webidl } = require('./webidl')
 const { Blob, File: NativeFile } = require('node:buffer')
 const assert = require('node:assert')
-const { isErrored } = require('../core/util')
+const { isErrored } = require('../../core/util')
 const { isArrayBuffer } = require('node:util/types')
 const { File: UndiciFile } = require('./file')
 const { serializeAMimeType } = require('./dataURL')

lib/cookies/index.js lib/web/cookies/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { kConnected, kSize } = require('../core/symbols')
+const { kConnected, kSize } = require('../../core/symbols')
 
 class CompatWeakRef {
   constructor (value) {

lib/cookies/parse.js lib/web/cookies/parse.js

@@ -6,7 +6,7 @@ const { kState } = require('./symbols')
 const { isBlobLike } = require('./util')
 const { webidl } = require('./webidl')
 const { parseMIMEType, serializeAMimeType } = require('./dataURL')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const encoder = new TextEncoder()
 
 class File extends Blob {

lib/cookies/util.js lib/web/cookies/util.js

@@ -2,7 +2,7 @@
 
 const { isBlobLike, iteratorMixin } = require('./util')
 const { kState } = require('./symbols')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const { File: UndiciFile, FileLike, isFileLike } = require('./file')
 const { webidl } = require('./webidl')
 const { File: NativeFile } = require('node:buffer')