#1404 Rebuild indexes to ensure their proper use

TheHive-Project · Jun 28, 2020 · fedaa44 · fedaa44
1 parent 0d66d0d
commit fedaa44
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala b/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
@@ -240,10 +240,7 @@ class Output @Inject() (
         .flatMap(_ => cortexSchema.update(db)(LocalUserSrv.getSystemAuthContext))
         .map { _ =>
           retrieveExistingData()
-          db match {
-            case jdb: JanusDatabase => jdb.removeAllIndexes()
-            case _                  =>
-          }
+          db.removeAllIndexes()
         }
     }
   }

diff --git a/thehive/app/org/thp/thehive/models/Case.scala b/thehive/app/org/thp/thehive/models/Case.scala
@@ -76,7 +76,7 @@ case class CaseUser()
 case class CaseCaseTemplate()
 
 @VertexEntity
-@DefineIndex(IndexType.tryUnique, "number")
+@DefineIndex(IndexType.unique, "number")
 //@DefineIndex(IndexType.fulltext, "title")
 //@DefineIndex(IndexType.fulltext, "description")
 //@DefineIndex(IndexType.standard, "startDate")

diff --git a/thehive/app/org/thp/thehive/models/Observable.scala b/thehive/app/org/thp/thehive/models/Observable.scala
@@ -41,6 +41,6 @@ case class RichObservable(
   def sighted: Boolean           = observable.sighted
 }
 
-@DefineIndex(IndexType.tryUnique, "data")
+@DefineIndex(IndexType.unique, "data")
 @VertexEntity
 case class Data(data: String)
diff --git a/thehive/app/org/thp/thehive/models/Tag.scala b/thehive/app/org/thp/thehive/models/Tag.scala
@@ -7,7 +7,7 @@ import play.api.Logger
 import scala.util.Try
 import scala.util.matching.Regex
 
-@DefineIndex(IndexType.tryUnique, "namespace", "predicate", "value")
+@DefineIndex(IndexType.unique, "namespace", "predicate", "value")
 @VertexEntity
 case class Tag(
     namespace: String,

diff --git a/thehive/app/org/thp/thehive/services/DatabaseWrapper.scala b/thehive/app/org/thp/thehive/services/DatabaseWrapper.scala
@@ -67,6 +67,7 @@ class DatabaseWrapper(dbProvider: Provider[Database]) extends Database {
   override def addSchemaIndexes(model: Model, models: Model*): Try[Unit]                                       = db.addSchemaIndexes(model, models: _*)
   override def addSchemaIndexes(models: Seq[Model]): Try[Unit]                                                 = db.addSchemaIndexes(models)
   override def enableIndexes(): Try[Unit]                                                                      = db.enableIndexes()
+  override def removeAllIndexes(): Unit                                                                        = db.removeAllIndexes()
   override def addProperty[T](model: String, propertyName: String, mapping: Mapping[_, _, _]): Try[Unit] =
     db.addProperty(model, propertyName, mapping)
   override def removeProperty(model: String, propertyName: String, usedOnlyByThisModel: Boolean): Try[Unit] =