Branch was updated using the 'autoupdate branch' Actions workflow.

Author: Octomerger

javascripts/experiment.js

@@ -27,13 +27,4 @@ export default function () {
   // const x = document.querySelector(...)
   // x.addEventListener('click', () => { sendSuccess(testName) })
   // if (xbucket === TREATMENT) applyTreatment(x)
-
-  const testName = 'search_lunr'
-  const xbucket = bucket(testName)
-  document.addEventListener('click', evt => {
-    if (!evt.target.closest('.search-result > a')) return
-    console.log(testName, xbucket) // eslint-disable-line
-    sendSuccess(testName)
-  })
-  // Treatment code in middleware/search.js
 }

lib/search/lunr-search.js

@@ -15,7 +15,7 @@ const LUNR_DIR = './indexes'
 const lunrIndexes = new Map()
 const lunrRecords = new Map()
 
-async function loadLunrResults ({ version, language, query, limit }) {
+module.exports = async function loadLunrResults ({ version, language, query, limit }) {
   const indexName = `${namePrefix}-${version}-${language}`
   if (!lunrIndexes.has(indexName) || !lunrRecords.has(indexName)) {
     lunrIndexes.set(indexName, await loadLunrIndex(indexName))
@@ -39,15 +39,6 @@ async function loadLunrResults ({ version, language, query, limit }) {
   return results
 }
 
-loadLunrResults.warmLunr = async function warmLunr () {
-  // Took about 60 seconds on local to warm them all...
-  // so doing just the most common for prewarming
-  const indexName = 'github-docs-dotcom-en'
-  lunrRecords.set(indexName, await loadLunrRecords(indexName))
-  lunrIndexes.set(indexName, await loadLunrIndex(indexName))
-  return true
-}
-
 async function loadLunrIndex (indexName) {
   const filePath = path.posix.join(__dirname, LUNR_DIR, `${indexName}.json.br`)
   // Do not set to 'utf8' on file reads
@@ -97,5 +88,3 @@ function field (result, record, name) {
 function mark (text) {
   return `<mark>${text}</mark>`
 }
-
-module.exports = loadLunrResults

lib/warm-server.js

@@ -3,7 +3,6 @@ const { loadPages, loadPageMap } = require('./pages')
 const loadRedirects = require('./redirects/precompile')
 const loadSiteData = require('./site-data')
 const loadSiteTree = require('./site-tree')
-const { warmLunr } = require('./search/lunr-search')
 
 // Instrument these functions so that
 // it's wrapped in a timer that reports to Datadog
@@ -12,16 +11,15 @@ const dog = {
   loadPageMap: statsd.asyncTimer(loadPageMap, 'load_page_map'),
   loadRedirects: statsd.asyncTimer(loadRedirects, 'load_redirects'),
   loadSiteData: statsd.timer(loadSiteData, 'load_site_data'),
-  loadSiteTree: statsd.asyncTimer(loadSiteTree, 'load_site_tree'),
-  warmLunr: statsd.asyncTimer(warmLunr, 'warm_lunr')
+  loadSiteTree: statsd.asyncTimer(loadSiteTree, 'load_site_tree')
 }
 
 // For local caching
-let pageList, pageMap, site, redirects, siteTree, isLunrWarmed
+let pageList, pageMap, site, redirects, siteTree
 
 function isFullyWarmed () {
   // NOTE: Yes, `pageList` is specifically excluded here as it is transient data
-  const fullyWarmed = !!(pageMap && site && redirects && siteTree && isLunrWarmed)
+  const fullyWarmed = !!(pageMap && site && redirects && siteTree)
   return fullyWarmed
 }
 
@@ -30,8 +28,7 @@ function getWarmedCache () {
     pages: pageMap,
     site,
     redirects,
-    siteTree,
-    isLunrWarmed
+    siteTree
   }
 }
 
@@ -62,10 +59,6 @@ async function warmServer () {
     siteTree = await dog.loadSiteTree(pageMap, site, redirects)
   }
 
-  if (!isLunrWarmed) {
-    isLunrWarmed = /* await */ dog.warmLunr()
-  }
-
   if (process.env.NODE_ENV !== 'test') {
     console.log(`Context primed in ${Date.now() - startTime} ms`)
   }

middleware/search.js

@@ -4,10 +4,6 @@ const versions = new Set(Object.values(require('../lib/search/versions')))
 const loadLunrResults = require('../lib/search/lunr-search')
 const loadAlgoliaResults = require('../lib/search/algolia-search')
 
-// temp
-const murmur = require('imurmurhash')
-// end temp
-
 const router = express.Router()
 
 router.get('/', async function postSearch (req, res, next) {
@@ -25,16 +21,8 @@ router.get('/', async function postSearch (req, res, next) {
     return res.status(200).json([])
   }
 
-  // temp
-  const userEventsId = req.cookies['_docs-events']
-  const experimentHash = userEventsId
-    ? murmur('search_lunr').hash(userEventsId).result()
-    : 0
-  const inTreatment = experimentHash % 2
-  // end temp
-
   try {
-    const results = process.env.AIRGAP || req.cookies.AIRGAP || inTreatment
+    const results = process.env.AIRGAP || req.cookies.AIRGAP
       ? await loadLunrResults({ version, language, query: `${query} ${filters || ''}`, limit })
       : await loadAlgoliaResults({ version, language, query, filters, limit })
     return res.status(200).json(results)