cleanup from merging

Signed-off-by: TJ Neuenfeldt <tjneu@amazon.com>

Author: neuenfeldttj

CHANGELOG.md

@@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Introduce SecureHttpTransportParameters experimental API (to complement SecureTransportParameters counterpart) ([#18572](https://github.com/opensearch-project/OpenSearch/issues/18572))
 - Create equivalents of JSM's AccessController in the java agent ([#18346](https://github.com/opensearch-project/OpenSearch/issues/18346))
 - Introduced a new cluster-level API to fetch remote store metadata (segments and translogs) for each shard of an index. ([#18257](https://github.com/opensearch-project/OpenSearch/pull/18257))
+- Add last index request timestamp columns to the `_cat/indices` API. ([10766](https://github.com/opensearch-project/OpenSearch/issues/10766))
+- Introduce a new pull-based ingestion plugin for file-based indexing (for local testing) ([#18591](https://github.com/opensearch-project/OpenSearch/pull/18591))
 - Add support for search pipeline in search and msearch template ([#18564](https://github.com/opensearch-project/OpenSearch/pull/18564))
 - Add support for non-timing info in profiler ([#18460](https://github.com/opensearch-project/OpenSearch/issues/18460))
 
@@ -31,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 - Add task cancellation checks in aggregators ([#18426](https://github.com/opensearch-project/OpenSearch/pull/18426))
 - Fix concurrent timings in profiler ([#18540](https://github.com/opensearch-project/OpenSearch/pull/18540))
+- Cannot communicate with HTTP/2 when reactor-netty is enabled ([#18599](https://github.com/opensearch-project/OpenSearch/pull/18599))
 
 ### Security
 

server/src/main/java/org/opensearch/plugins/SearchPlugin.java

@@ -96,7 +96,6 @@
  * @opensearch.api
  */
 public interface SearchPlugin {
-
     /**
      * The new {@link ScoreFunction}s defined by this plugin.
      */

server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java

@@ -152,14 +152,10 @@ private ContextIndexSearcher(
         this.searchContext = searchContext;
     }
 
-    public void setQueryProfiler(QueryProfiler profiler) {
+    public void setProfiler(QueryProfiler profiler) {
         this.profiler = profiler;
     }
 
-    public QueryProfiler getQueryProfiler() {
-        return profiler;
-    }
-
     /**
      * Add a {@link Runnable} that will be run on a regular basis while accessing documents in the
      * DirectoryReader but also while collecting them and check for query cancellation or timeout.
@@ -217,12 +213,7 @@ public Weight createWeight(Query query, ScoreMode scoreMode, float boost) throws
             // createWeight() is called for each query in the tree, so we tell the queryProfiler
             // each invocation so that it can build an internal representation of the query
             // tree
-            ContextualProfileBreakdown profile = null;
-            try {
-                profile = profiler.getQueryBreakdown(query);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+            ContextualProfileBreakdown profile = profiler.getQueryBreakdown(query);
             Timer timer = profile.getTimer(QueryTimingType.CREATE_WEIGHT);
             timer.start();
             final Weight weight;

server/src/main/java/org/opensearch/search/profile/AbstractInternalProfileTree.java

@@ -210,9 +210,4 @@ private void updateParent(int childToken) {
         tree.set(parent, parentNode);
     }
 
-    public PB getStackTop() {
-        assert stack.isEmpty() == false;
-        return breakdowns.get(stack.peekLast());
-    }
-
 }

server/src/main/java/org/opensearch/search/profile/AbstractProfileBreakdown.java

@@ -32,8 +32,6 @@
 
 package org.opensearch.search.profile;
 
-import org.opensearch.common.annotation.PublicApi;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
@@ -47,7 +45,6 @@
  *
  * @opensearch.internal
  */
-@PublicApi(since = "3.0.0")
 public abstract class AbstractProfileBreakdown {
 
     public static final String NODE_TIME_RAW = "time_in_nanos";

server/src/main/java/org/opensearch/search/profile/AbstractProfiler.java

@@ -32,16 +32,13 @@
 
 package org.opensearch.search.profile;
 
-import org.opensearch.common.annotation.PublicApi;
-
 import java.util.List;
 
 /**
  * Base class for a profiler
  *
  * @opensearch.internal
  */
-@PublicApi(since = "3.0.0")
 public abstract class AbstractProfiler<PB extends AbstractProfileBreakdown, E> {
 
     protected final AbstractInternalProfileTree<PB, E> profileTree;

server/src/main/java/org/opensearch/search/profile/ContextualProfileBreakdown.java

@@ -10,26 +10,27 @@
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Collector;
-import org.opensearch.common.annotation.PublicApi;
 
 import java.util.List;
 import java.util.Map;
 
 /**
- * A {@link AbstractProfileBreakdown} for query timings with contexts.
+ * Provide contextual profile breakdowns which are associated with freestyle context. Used when concurrent
+ * search over segments is activated and each collector needs own non-shareable profile breakdown instance.
+ *
+ * @opensearch.internal
  */
-@PublicApi(since = "3.0.0")
 public abstract class ContextualProfileBreakdown extends AbstractProfileBreakdown {
 
-    /**
-     * Sole constructor.
-     *
-     * @param metrics
-     */
     public ContextualProfileBreakdown(Map<String, Class<? extends ProfileMetric>> metrics) {
         super(metrics);
     }
 
+    /**
+     * Return (or create) contextual profile breakdown instance
+     * @param context freestyle context
+     * @return contextual profile breakdown instance
+     */
     public abstract ContextualProfileBreakdown context(Object context);
 
     public void associateCollectorToLeaves(Collector collector, LeafReaderContext leaf) {}

server/src/main/java/org/opensearch/search/profile/Profilers.java

@@ -72,7 +72,7 @@ public QueryProfiler addQueryProfiler() {
         QueryProfiler profiler = isConcurrentSegmentSearchEnabled
             ? new ConcurrentQueryProfiler(new ConcurrentQueryProfileTree())
             : new QueryProfiler(new InternalQueryProfileTree());
-        searcher.setQueryProfiler(profiler);
+        searcher.setProfiler(profiler);
         queryProfilers.add(profiler);
         return profiler;
     }

server/src/main/java/org/opensearch/search/profile/Timer.java

@@ -32,8 +32,6 @@
 
 package org.opensearch.search.profile;
 
-import org.opensearch.common.annotation.PublicApi;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -53,7 +51,6 @@
  *
  *  @opensearch.internal
  */
-@PublicApi(since = "3.0.0")
 public class Timer extends ProfileMetric {
     public static final String TIMING_TYPE_COUNT_SUFFIX = "_count";
     public static final String TIMING_TYPE_START_TIME_SUFFIX = "_start_time";
@@ -62,7 +59,7 @@ public class Timer extends ProfileMetric {
     private long timing, count, lastCount, start, earliestTimerStartTime;
 
     public Timer() {
-        super("");
+        this(0, 0, 0, 0, 0);
     }
 
     public Timer(long timing, long count, long lastCount, long start, long earliestTimerStartTime) {

server/src/main/java/org/opensearch/search/profile/query/ConcurrentQueryProfiler.java

@@ -81,7 +81,7 @@ public List<ProfileResult> getTree() {
      */
     @Override
     public void startRewriteTime() {
-        Timer rewriteTimer = new Timer("rewrite_timer");
+        Timer rewriteTimer = new Timer();
         threadToRewriteTimers.computeIfAbsent(getCurrentThreadId(), k -> new LinkedList<>()).add(rewriteTimer);
         rewriteTimer.start();
     }