From dbfabd90fc288b58cc73d7377202f27a68d8b845 Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Thu, 2 Sep 2021 10:26:41 +0200
Subject: [PATCH] Fix NumberFieldMapper Referencing its Own Builder (#77131)

Investigating the heap use of mapper instances I found this.
It seems quite a bit of overhead for these instances goes into
the builder field. In other mappers we retain the script service
and the script outright, so I did the same thing here to make these
instances a little smaller.
---
 .../elasticsearch/index/mapper/NumberFieldMapper.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
index add74844175c4..8fe52b274c26d 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
@@ -80,7 +80,7 @@ public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<Number> nullValue;
 
-        private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).builder.script.get());
+        private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
         private final Parameter<String> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
@@ -1065,7 +1065,6 @@ public CollapseType collapseType() {
         }
     }
 
-    private final Builder builder;
     private final NumberType type;
 
     private final boolean indexed;
@@ -1077,6 +1076,8 @@ public CollapseType collapseType() {
     private final FieldValues<Number> scriptValues;
     private final boolean ignoreMalformedByDefault;
     private final boolean coerceByDefault;
+    private final ScriptCompiler scriptCompiler;
+    private final Script script;
 
     private NumberFieldMapper(
             String simpleName,
@@ -1095,7 +1096,8 @@ private NumberFieldMapper(
         this.ignoreMalformedByDefault = builder.ignoreMalformed.getDefaultValue().value();
         this.coerceByDefault = builder.coerce.getDefaultValue().value();
         this.scriptValues = builder.scriptValues();
-        this.builder = builder;
+        this.scriptCompiler = builder.scriptCompiler;
+        this.script = builder.script.getValue();
     }
 
     boolean coerce() {
@@ -1170,6 +1172,6 @@ protected void indexScriptValues(SearchLookup searchLookup, LeafReaderContext re
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(simpleName(), type, builder.scriptCompiler, ignoreMalformedByDefault, coerceByDefault).init(this);
+        return new Builder(simpleName(), type, scriptCompiler, ignoreMalformedByDefault, coerceByDefault).init(this);
     }
 }