Merge pull request #976 from WildMeOrg/974_new_encounter_indexing

no longer background encounter indexing itself
WildMeOrg · Jan 8, 2025 · d0a9ac7 · d0a9ac7
2 parents 023135f + cfa23fd
commit d0a9ac7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/src/main/java/org/ecocean/Base.java b/src/main/java/org/ecocean/Base.java
@@ -106,9 +106,12 @@ public JSONObject opensearchMapping() {
 
     public void opensearchIndex()
     throws IOException {
+        long startT = System.currentTimeMillis();
         OpenSearch opensearch = new OpenSearch();
 
         opensearch.index(this.opensearchIndexName(), this);
+        long endT = System.currentTimeMillis();
+        System.out.println("opensearchIndex(): " + (endT - startT) + "ms indexing " + this);
     }
 
     // this will index "related" objects as needed

diff --git a/src/main/java/org/ecocean/Encounter.java b/src/main/java/org/ecocean/Encounter.java
@@ -4705,35 +4705,4 @@ public void sendCreationEmails(Shepherd myShepherd, String langCode) {
         }
     }
 
-    public void opensearchIndexDeep()
-    throws IOException {
-        final String encId = this.getId();
-        final Encounter origEnc = this;
-        ExecutorService executor = Executors.newFixedThreadPool(4);
-        Runnable rn = new Runnable() {
-            public void run() {
-                Shepherd bgShepherd = new Shepherd("context0");
-                bgShepherd.setAction("Encounter.opensearchIndexDeep_" + encId);
-                bgShepherd.beginDBTransaction();
-                try {
-                    Encounter enc = bgShepherd.getEncounter(encId);
-                    if (enc == null) {
-                        // we use origEnc if we can (especially necessary on initial creation of Encounter)
-                        if (origEnc != null) origEnc.opensearchIndex();
-                        bgShepherd.rollbackAndClose();
-                        executor.shutdown();
-                        return;
-                    }
-                    enc.opensearchIndex();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                } finally {
-                    bgShepherd.rollbackAndClose();
-                }
-                executor.shutdown();
-            }
-        };
-
-        executor.execute(rn);
-    }
 }
diff --git a/src/main/java/org/ecocean/Occurrence.java b/src/main/java/org/ecocean/Occurrence.java
@@ -1370,7 +1370,7 @@ public void run() {
                 try {
                     Occurrence occur = bgShepherd.getOccurrence(occurId);
                     if ((occur == null) || (occur.getEncounters() == null)) {
-                        bgShepherd.rollbackAndClose();
+                        // rollbackAndClose handled by finally
                         executor.shutdown();
                         return;
                     }