Revert "UBER-921: Improve full text search (#3848)"

This reverts commit ce96f4d.

models/recruit/src/index.ts

@@ -161,15 +161,12 @@ export class TApplicant extends TTask implements Applicant {
     startDate!: Timestamp | null
 
   @Prop(TypeRef(contact.mixin.Employee), recruit.string.AssignedRecruiter)
-  @Index(IndexKind.Indexed)
   declare assignee: Ref<Employee> | null
 
   @Prop(TypeRef(task.class.State), task.string.TaskState, { _id: recruit.attribute.State })
-  @Index(IndexKind.Indexed)
   declare status: Ref<State>
 
   @Prop(TypeRef(task.class.DoneState), task.string.TaskStateDone, { _id: recruit.attribute.DoneState })
-  @Index(IndexKind.Indexed)
   declare doneState: Ref<DoneState>
 }
 

models/task/src/index.ts

@@ -90,11 +90,9 @@ export class TLostState extends TDoneState implements LostState {}
 @UX(task.string.Task, task.icon.Task, task.string.Task)
 export class TTask extends TAttachedDoc implements Task {
   @Prop(TypeRef(core.class.Status), task.string.TaskState, { _id: task.attribute.State })
-  @Index(IndexKind.Indexed)
     status!: Ref<Status>
 
   @Prop(TypeRef(task.class.DoneState), task.string.TaskStateDone, { _id: task.attribute.DoneState })
-  @Index(IndexKind.Indexed)
     doneState!: Ref<DoneState> | null
 
   @Prop(TypeString(), task.string.TaskNumber)

packages/core/src/classes.ts

@@ -102,8 +102,6 @@ export enum IndexKind {
   FullText,
   /**
    * For attribute with this annotation should be created an index in mongo database
-   *
-   * Also mean to include into Elastic search.
    */
   Indexed
 }

packages/core/src/utils.ts

@@ -179,13 +179,6 @@ export function isFullTextAttribute (attr: AnyAttribute): boolean {
   )
 }
 
-/**
- * @public
- */
-export function isIndexedAttribute (attr: AnyAttribute): boolean {
-  return attr.index === IndexKind.Indexed
-}
-
 /**
  * @public
  */

packages/presentation/src/components/IndexedDocumentContent.svelte

@@ -58,7 +58,7 @@
   <span class="font-medium">Summary:</span>
   {#each summary.split('\n') as line}
     {@const hl = search.length > 0 && line.toLowerCase().includes(search.toLowerCase())}
-    <span class="select-text" class:text-md={!hl} class:highlight={hl}>{line}</span>
+    <span class:text-md={!hl} class:highlight={hl}>{line}</span>
   {/each}
 {:else if indexDoc}
   {#each attributes as attr}
@@ -77,13 +77,13 @@
           {#if search.length > 0}
             <span class="font-medium">Result:</span>
             {#each doc.filter((line) => line.toLowerCase().includes(search.toLowerCase())) as line}
-              <span class="select-text" class:highlight={true}>{line}</span>
+              <span class:highlight={true}>{line}</span>
             {/each}
             <br />
           {/if}
           {#each doc as line}
             {@const hl = search.length > 0 && line.toLowerCase().includes(search.toLowerCase())}
-            <span class="select-text" class:text-md={!hl} class:highlight={hl}>{line}</span>
+            <span class:text-md={!hl} class:highlight={hl}>{line}</span>
           {/each}
         </div>
       {/each}

server/core/src/fulltext.ts

@@ -19,13 +19,11 @@ import core, {
   Class,
   Doc,
   DocIndexState,
-  docKey,
   DocumentQuery,
   FindOptions,
   FindResult,
   Hierarchy,
-  isFullTextAttribute,
-  isIndexedAttribute,
+  IndexKind,
   MeasureContext,
   ObjQueryType,
   Ref,
@@ -137,22 +135,10 @@ export class FullTextIndex implements WithFind {
     }
     try {
       for (const [k, attr] of attrs) {
-        if (isFullTextAttribute(attr) || isIndexedAttribute(attr)) {
+        if (attr.index === IndexKind.FullText) {
           const vv = (query as any)[k]
           if (vv != null) {
-            if (
-              k === '_class' ||
-              k === 'modifiedBy' ||
-              k === 'modifiedOn' ||
-              k === 'space' ||
-              k === 'attachedTo' ||
-              k === 'attachedToClass'
-            ) {
-              findQuery[k] = vv
-            } else {
-              const docKeyValue = docKey(attr.name, { _class: attr.attributeOf })
-              findQuery[docKeyValue] = vv
-            }
+            findQuery[k] = vv
           }
         }
         if (attr.type._class === core.class.Collection) {
@@ -179,12 +165,12 @@ export class FullTextIndex implements WithFind {
       return true
     })
 
-    const fullTextLimit = Math.min(5000, (options?.limit ?? 200) * 100)
+    const fullTextLimit = options?.limit ?? 200
 
     let { docs, pass } = await this.indexer.search(classes, findQuery, fullTextLimit)
 
     if (docs.length === 0 && pass) {
-      docs = await this.adapter.search(classes, findQuery, fullTextLimit)
+      docs = await this.adapter.search(classes, query, fullTextLimit)
     }
     const indexedDocMap = new Map<Ref<Doc>, IndexedDoc>()
 

server/core/src/indexer/content.ts

@@ -27,7 +27,7 @@ import core, {
 import { MinioService } from '@hcengineering/minio'
 import { ContentTextAdapter, IndexedDoc } from '../types'
 import { contentStageId, DocUpdateHandler, fieldStateId, FullTextPipeline, FullTextPipelineStage } from './types'
-import { docKey, docUpdKey, getFullTextIndexableAttributes } from './utils'
+import { docKey, docUpdKey, getFullTextAttributes } from './utils'
 
 /**
  * @public
@@ -80,7 +80,7 @@ export class ContentRetrievalStage implements FullTextPipelineStage {
   }
 
   async updateContent (doc: DocIndexState, pipeline: FullTextPipeline): Promise<void> {
-    const attributes = getFullTextIndexableAttributes(pipeline.hierarchy, doc.objectClass)
+    const attributes = getFullTextAttributes(pipeline.hierarchy, doc.objectClass)
     // Copy content attributes as well.
     const update: DocumentUpdate<DocIndexState> = {}
 

server/core/src/indexer/field.ts

@@ -34,7 +34,7 @@ import {
   docKey,
   docUpdKey,
   getContent,
-  getFullTextIndexableAttributes,
+  getFullTextAttributes,
   getFullTextContext,
   isFullTextAttribute,
   loadIndexStageStage
@@ -112,7 +112,7 @@ export class IndexedFieldStage implements FullTextPipelineStage {
       const docs = await this.dbStorage.findAll(metrics, objClass, {
         _id: { $in: Array.from(valueIds.keys()) }
       })
-      const attributes = getFullTextIndexableAttributes(pipeline.hierarchy, objClass)
+      const attributes = getFullTextAttributes(pipeline.hierarchy, objClass)
 
       // Child docs.
 

server/core/src/indexer/fulltextPush.ts

@@ -22,8 +22,7 @@ import core, {
   DocumentQuery,
   DocumentUpdate,
   extractDocKey,
-  isFullTextAttribute,
-  isIndexedAttribute,
+  IndexKind,
   MeasureContext,
   Ref,
   ServerStorage,
@@ -111,7 +110,7 @@ export class FullTextPushStage implements FullTextPipelineStage {
       if (
         attrObj !== null &&
         attrObj !== undefined &&
-        (isFullTextAttribute(attrObj) || isIndexedAttribute(attrObj)) &&
+        attrObj.index === IndexKind.FullText &&
         (attrObj.type._class === core.class.RefTo ||
           (attrObj.type._class === core.class.ArrOf && (attrObj.type as ArrOf<any>).of._class === core.class.RefTo))
       ) {

server/core/src/indexer/types.ts

@@ -102,7 +102,7 @@ export const contentStageId = 'cnt-v2b'
 /**
  * @public
  */
-export const fieldStateId = 'fld-v6'
+export const fieldStateId = 'fld-v5'
 
 /**
  * @public

server/core/src/indexer/utils.ts

@@ -33,7 +33,6 @@ import core, {
   Hierarchy,
   IndexStageState,
   isFullTextAttribute,
-  isIndexedAttribute,
   Obj,
   Ref,
   Space,
@@ -46,11 +45,11 @@ import { FullTextPipeline } from './types'
 /**
  * @public
  */
-export function getFullTextIndexableAttributes (hierarchy: Hierarchy, clazz: Ref<Class<Obj>>): AnyAttribute[] {
+export function getFullTextAttributes (hierarchy: Hierarchy, clazz: Ref<Class<Obj>>): AnyAttribute[] {
   const allAttributes = hierarchy.getAllAttributes(clazz)
   const result: AnyAttribute[] = []
   for (const [, attr] of allAttributes) {
-    if (isFullTextAttribute(attr) || isIndexedAttribute(attr)) {
+    if (isFullTextAttribute(attr)) {
       result.push(attr)
     }
   }
@@ -60,7 +59,7 @@ export function getFullTextIndexableAttributes (hierarchy: Hierarchy, clazz: Ref
     .filter((m) => hierarchy.getClass(m).kind === ClassifierKind.MIXIN)
     .forEach((m) => {
       for (const [, v] of hierarchy.getAllAttributes(m, clazz)) {
-        if (isFullTextAttribute(v) || isIndexedAttribute(v)) {
+        if (isFullTextAttribute(v)) {
           result.push(v)
         }
       }
@@ -120,10 +119,10 @@ export function isClassIndexable (hierarchy: Hierarchy, c: Ref<Class<Doc>>): boo
     hierarchy.setClassifierProp(c, 'class_indexed', false)
     return false
   }
-  const attrs = getFullTextIndexableAttributes(hierarchy, c)
+  const attrs = getFullTextAttributes(hierarchy, c)
   for (const d of hierarchy.getDescendants(c)) {
     if (hierarchy.isMixin(d)) {
-      attrs.push(...getFullTextIndexableAttributes(hierarchy, d))
+      attrs.push(...getFullTextAttributes(hierarchy, d))
     }
   }
 

server/elastic/src/adapter.ts

@@ -133,28 +133,26 @@ class ElasticAdapter implements FullTextAdapter {
       }
     }
 
-    for (const [q, v] of Object.entries(query)) {
-      if (!q.startsWith('$')) {
-        if (typeof v === 'object') {
-          if (v.$in !== undefined) {
-            request.bool.should.push({
-              terms: {
-                [q]: v.$in,
-                boost: 100.0
-              }
-            })
-          }
-        } else {
+    if (query.space != null) {
+      if (typeof query.space === 'object') {
+        if (query.space.$in !== undefined) {
           request.bool.should.push({
-            term: {
-              [q]: {
-                value: v,
-                boost: 100.0,
-                case_insensitive: true
-              }
+            terms: {
+              space: query.space.$in.map((c) => c.toLowerCase()),
+              boost: 2.0
             }
           })
         }
+      } else {
+        request.bool.should.push({
+          term: {
+            space: {
+              value: query.space,
+              boost: 2.0,
+              case_insensitive: true
+            }
+          }
+        })
       }
     }