No need for a PreviewRow

iverase · Jan 16, 2025 · b97136a · b97136a
1 parent 6be2755
commit b97136a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/...main/java/org/elasticsearch/xpack/ml/action/TransportPreviewDataFrameAnalyticsAction.java b/...main/java/org/elasticsearch/xpack/ml/action/TransportPreviewDataFrameAnalyticsAction.java
@@ -77,10 +77,10 @@ public TransportPreviewDataFrameAnalyticsAction(
         this.clusterService = clusterService;
     }
 
-    private static Map<String, Object> mergeRow(DataFrameDataExtractor.PreviewRow row, List<String> fieldNames) {
-        return row.getValues() == null
+    private static Map<String, Object> mergeRow(String[] row, List<String> fieldNames) {
+        return row == null
             ? Collections.emptyMap()
-            : IntStream.range(0, row.getValues().length).boxed().collect(Collectors.toMap(fieldNames::get, i -> row.getValues()[i]));
+            : IntStream.range(0, row.length).boxed().collect(Collectors.toMap(fieldNames::get, i -> row[i]));
     }
 
     @Override

diff --git a/.../src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/DataFrameDataExtractor.java b/.../src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/DataFrameDataExtractor.java
@@ -125,7 +125,7 @@ public Optional<SearchHit[]> next() throws IOException {
      * Does no sorting of the results.
      * @param listener To alert with the extracted rows
      */
-    public void preview(ActionListener<List<PreviewRow>> listener) {
+    public void preview(ActionListener<List<String[]>> listener) {
 
         SearchRequestBuilder searchRequestBuilder = new SearchRequestBuilder(client)
             // This ensures the search throws if there are failures and the scroll context gets cleared automatically
@@ -154,10 +154,10 @@ public void preview(ActionListener<List<PreviewRow>> listener) {
                     return;
                 }
 
-                List<PreviewRow> rows = new ArrayList<>(searchResponse.getHits().getHits().length);
+                List<String[]> rows = new ArrayList<>(searchResponse.getHits().getHits().length);
                 for (SearchHit hit : searchResponse.getHits().getHits()) {
                     String[] extractedValues = extractValues(hit);
-                    rows.add(new PreviewRow(extractedValues));
+                    rows.add(extractedValues);
                 }
                 delegate.onResponse(rows);
             })
@@ -433,21 +433,6 @@ public DataSummary(long rows, int cols) {
         }
     }
 
-    public static class PreviewRow {
-
-        @Nullable
-        private final String[] values;
-
-        private PreviewRow(String[] values) {
-            this.values = values;
-        }
-
-        @Nullable
-        public String[] getValues() {
-            return values;
-        }
-    }
-
     public static class Row {
 
         private final SearchHit hit;