Skip to content

Add a generic method for reading shard field stats from an Engine #125055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 25, 2025
Merged

Add a generic method for reading shard field stats from an Engine #125055

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bcc8d26
Add a generic method for reading shard stats from an Engine
arteam Mar 17, 2025
51547bf
getShardFieldStats throws AlreadyClosedException
arteam Mar 18, 2025
678b7e5
Merge remote-tracking branch 'origin/main' into engine-shard-field-stats
arteam Mar 18, 2025
14b3530
Merge remote-tracking branch 'origin/main' into engine-shard-field-stats
arteam Mar 19, 2025
2c8adb1
Merge remote-tracking branch 'origin/main' into engine-shard-field-stats
arteam Mar 19, 2025
1300121
Merge branch 'main' into engine-shard-field-stats
arteam Mar 20, 2025
ef7be12
Merge remote-tracking branch 'origin/main' into engine-shard-field-stats
arteam Mar 21, 2025
87878fe
Use shardFieldStats instead of getShardFieldStats
arteam Mar 21, 2025
cb2b70b
shardFieldStats can be static
arteam Mar 24, 2025
e27196b
Merge remote-tracking branch 'origin/main' into engine-shard-field-stats
arteam Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions server/src/main/java/org/elasticsearch/index/engine/Engine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.IndexVersion;
import org.elasticsearch.index.VersionType;
import org.elasticsearch.index.codec.FieldInfosWithUsages;
import org.elasticsearch.index.mapper.DocumentParser;
import org.elasticsearch.index.mapper.FieldNamesFieldMapper;
import org.elasticsearch.index.mapper.LuceneDocument;
Expand All @@ -76,6 +77,7 @@
import org.elasticsearch.index.shard.DenseVectorStats;
import org.elasticsearch.index.shard.DocsStats;
import org.elasticsearch.index.shard.IndexShard;
import org.elasticsearch.index.shard.ShardFieldStats;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.index.shard.ShardLongFieldRange;
import org.elasticsearch.index.shard.SparseVectorStats;
Expand Down Expand Up @@ -243,6 +245,34 @@ protected final DocsStats docsStats(IndexReader indexReader) {
return new DocsStats(numDocs, numDeletedDocs, sizeInBytes);
}

/**
* @throws AlreadyClosedException if the shard is closed
*/
public ShardFieldStats shardFieldStats() {
try (var searcher = acquireSearcher("shard_field_stats", Engine.SearcherScope.INTERNAL)) {
return shardFieldStats(searcher.getLeafContexts());
}
}

protected ShardFieldStats shardFieldStats(List<LeafReaderContext> leaves) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we should make this method static.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point! I've changed it to be static cb2b70b

int numSegments = 0;
int totalFields = 0;
long usages = 0;
for (LeafReaderContext leaf : leaves) {
numSegments++;
var fieldInfos = leaf.reader().getFieldInfos();
totalFields += fieldInfos.size();
if (fieldInfos instanceof FieldInfosWithUsages ft) {
if (usages != -1) {
usages += ft.getTotalUsages();
}
} else {
usages = -1;
}
}
return new ShardFieldStats(numSegments, totalFields, usages);
}

/**
* Returns the {@link DenseVectorStats} for this engine
*/
Expand Down
25 changes: 3 additions & 22 deletions server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.apache.lucene.index.FilterDirectoryReader;
import org.apache.lucene.index.IndexCommit;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.search.QueryCachingPolicy;
import org.apache.lucene.search.ReferenceManager;
Expand Down Expand Up @@ -84,7 +83,6 @@
import org.elasticsearch.index.cache.query.TrivialQueryCachingPolicy;
import org.elasticsearch.index.cache.request.ShardRequestCache;
import org.elasticsearch.index.codec.CodecService;
import org.elasticsearch.index.codec.FieldInfosWithUsages;
import org.elasticsearch.index.engine.CommitStats;
import org.elasticsearch.index.engine.Engine;
import org.elasticsearch.index.engine.Engine.GetResult;
Expand Down Expand Up @@ -4160,26 +4158,9 @@ public void beforeRefresh() {
@Override
public void afterRefresh(boolean didRefresh) {
if (shardFieldStats == null || didRefresh) {
try (var searcher = getEngine().acquireSearcher("shard_field_stats", Engine.SearcherScope.INTERNAL)) {
int numSegments = 0;
int totalFields = 0;
long usages = 0;
for (LeafReaderContext leaf : searcher.getLeafContexts()) {
numSegments++;
var fieldInfos = leaf.reader().getFieldInfos();
totalFields += fieldInfos.size();
if (fieldInfos instanceof FieldInfosWithUsages ft) {
if (usages != -1) {
usages += ft.getTotalUsages();
}
} else {
usages = -1;
}
}
shardFieldStats = new ShardFieldStats(numSegments, totalFields, usages);
} catch (AlreadyClosedException ignored) {

}
try {
shardFieldStats = getEngine().shardFieldStats();
} catch (AlreadyClosedException ignored) {}
}
}
}
Expand Down