Skip to content

Commit 1a566d7

Browse files
authored
Correct name of IndexFieldData#loadGlobalDirect. (#60492)
It seems 'localGlobalDirect' was just a typo.
1 parent 749212d commit 1a566d7

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ interface Global<FD extends LeafFieldData> extends IndexFieldData<FD> {
253253

254254
IndexFieldData<FD> loadGlobal(DirectoryReader indexReader);
255255

256-
IndexFieldData<FD> localGlobalDirect(DirectoryReader indexReader) throws Exception;
256+
IndexFieldData<FD> loadGlobalDirect(DirectoryReader indexReader) throws Exception;
257257

258258
}
259259
}

server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public <FD extends LeafFieldData, IFD extends IndexFieldData<FD>> FD load(LeafRe
6969
@SuppressWarnings("unchecked")
7070
public <FD extends LeafFieldData, IFD extends IndexFieldData.Global<FD>> IFD load(DirectoryReader indexReader,
7171
IFD indexFieldData) throws Exception {
72-
return (IFD) indexFieldData.localGlobalDirect(indexReader);
72+
return (IFD) indexFieldData.loadGlobalDirect(indexReader);
7373
}
7474

7575
@Override

server/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public interface IndexOrdinalsFieldData extends IndexFieldData.Global<LeafOrdina
4040
* Load a global view of the ordinals for the given {@link IndexReader}.
4141
*/
4242
@Override
43-
IndexOrdinalsFieldData localGlobalDirect(DirectoryReader indexReader) throws Exception;
43+
IndexOrdinalsFieldData loadGlobalDirect(DirectoryReader indexReader) throws Exception;
4444

4545
/**
4646
* Returns the underlying {@link OrdinalMap} for this fielddata

server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public IndexOrdinalsFieldData loadGlobal(DirectoryReader indexReader) {
9292
}
9393

9494
@Override
95-
public IndexOrdinalsFieldData localGlobalDirect(DirectoryReader indexReader) throws Exception {
95+
public IndexOrdinalsFieldData loadGlobalDirect(DirectoryReader indexReader) throws Exception {
9696
return this;
9797
}
9898

@@ -183,7 +183,7 @@ public IndexOrdinalsFieldData loadGlobal(DirectoryReader indexReader) {
183183
}
184184

185185
@Override
186-
public IndexOrdinalsFieldData localGlobalDirect(DirectoryReader indexReader) throws Exception {
186+
public IndexOrdinalsFieldData loadGlobalDirect(DirectoryReader indexReader) throws Exception {
187187
return this;
188188
}
189189

server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private IndexOrdinalsFieldData loadGlobalInternal(DirectoryReader indexReader) {
115115
}
116116

117117
@Override
118-
public IndexOrdinalsFieldData localGlobalDirect(DirectoryReader indexReader) throws Exception {
118+
public IndexOrdinalsFieldData loadGlobalDirect(DirectoryReader indexReader) throws Exception {
119119
return GlobalOrdinalsBuilder.build(
120120
indexReader,
121121
this,

server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public IndexOrdinalsFieldData loadGlobal(DirectoryReader indexReader) {
176176
}
177177

178178
@Override
179-
public IndexOrdinalsFieldData localGlobalDirect(DirectoryReader indexReader) throws Exception {
179+
public IndexOrdinalsFieldData loadGlobalDirect(DirectoryReader indexReader) throws Exception {
180180
return loadGlobal(indexReader);
181181
}
182182

server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private IndexOrdinalsFieldData loadGlobalInternal(DirectoryReader indexReader) {
191191
}
192192

193193
@Override
194-
public IndexOrdinalsFieldData localGlobalDirect(DirectoryReader indexReader) throws Exception {
194+
public IndexOrdinalsFieldData loadGlobalDirect(DirectoryReader indexReader) throws Exception {
195195
return GlobalOrdinalsBuilder.build(indexReader, this, breakerService, logger, scriptFunction);
196196
}
197197

server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public <FD extends LeafFieldData, IFD extends IndexFieldData.Global<FD>> IFD loa
167167
final Accountable accountable = cache.computeIfAbsent(key, k -> {
168168
ElasticsearchDirectoryReader.addReaderCloseListener(indexReader, IndexFieldCache.this);
169169
Collections.addAll(k.listeners, this.listeners);
170-
final Accountable ifd = (Accountable) indexFieldData.localGlobalDirect(indexReader);
170+
final Accountable ifd = (Accountable) indexFieldData.loadGlobalDirect(indexReader);
171171
for (Listener listener : k.listeners) {
172172
try {
173173
listener.onCache(shardId, fieldName, ifd);

server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public <FD extends LeafFieldData, IFD extends IndexFieldData<FD>> FD load(LeafRe
115115
public <FD extends LeafFieldData, IFD extends IndexFieldData.Global<FD>> IFD load(DirectoryReader indexReader,
116116
IFD indexFieldData) throws Exception {
117117
cachedGlobally++;
118-
return (IFD) indexFieldData.localGlobalDirect(indexReader);
118+
return (IFD) indexFieldData.loadGlobalDirect(indexReader);
119119
}
120120

121121
@Override

x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ public IndexOrdinalsFieldData loadGlobal(DirectoryReader indexReader) {
393393
}
394394

395395
@Override
396-
public IndexOrdinalsFieldData localGlobalDirect(DirectoryReader indexReader) throws Exception {
397-
IndexOrdinalsFieldData fieldData = delegate.localGlobalDirect(indexReader);
396+
public IndexOrdinalsFieldData loadGlobalDirect(DirectoryReader indexReader) throws Exception {
397+
IndexOrdinalsFieldData fieldData = delegate.loadGlobalDirect(indexReader);
398398
return new KeyedFlatObjectFieldData(key, fieldData);
399399
}
400400

0 commit comments

Comments
 (0)