Skip to content
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

Occupied size optimization #735

Closed
wants to merge 2 commits into from
+6 −10
Closed

Occupied size optimization #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55f3384
Reuse BATBlock.getOccupiedSize() to compute the size of the root prop…
ebourg Nov 27, 2024
30fdeba
Minor optimization of BATBlock.getOccupiedSize()
ebourg Nov 27, 2024
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
7 changes: 3 additions & 4 deletions poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,9 @@ private int computeSize() {
int entriesPerBlock = _filesystem.getBigBlockSizeDetails().getBATEntriesPerBlock();
for (int sbatIndex = _sbat_blocks.size() - 1; sbatIndex >= 0; sbatIndex--) {
BATBlock sbat = _sbat_blocks.get(sbatIndex);
for (int miniBlockIndex = entriesPerBlock - 1; miniBlockIndex >= 0; miniBlockIndex--) {
if (sbat.getValueAt(miniBlockIndex) != POIFSConstants.UNUSED_BLOCK) {
return (sbatIndex * entriesPerBlock) + miniBlockIndex + 1;
}
int occupiedSize = sbat.getOccupiedSize();
if (occupiedSize > 0) {
return (sbatIndex * entriesPerBlock) + occupiedSize;
}
}

Expand Down
9 changes: 3 additions & 6 deletions poi/src/main/java/org/apache/poi/poifs/storage/BATBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,12 @@ public int getUsedSectors(boolean isAnXBAT) {
* @since POI 5.0.0
*/
public int getOccupiedSize() {
int usedSectors = _values.length;
for (int k = _values.length - 1; k >= 0; k--) {
if(_values[k] == POIFSConstants.UNUSED_BLOCK) {
usedSectors--;
} else {
break;
if (_values[k] != POIFSConstants.UNUSED_BLOCK) {
return k + 1;
}
}
return usedSectors;
return 0;
}

public int getValueAt(int relativeOffset) {
Expand Down