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

Jump to bottom

Read cache prototype #21228

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Read cache prototype #21228

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
b30b57d
Read cache prototype
Nov 4, 2024
ec8882e
Fix compilation
Nov 18, 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
16 changes: 16 additions & 0 deletions OsmAnd-java/src/main/java/com/google/protobuf/CodedInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,10 @@ public static long decodeZigZag64(final long n) {
/** See setSizeLimit() */
// ! osmand change !
private long sizeLimit = DEFAULT_SIZE_LIMIT;
// FIXME this part not ready to be merged to master (delete)
private boolean READ_SEEK;
public static int READ_BYTES;
public static int READ_BLOCKS;

private static final int DEFAULT_RECURSION_LIMIT = 64;
// ! osmand change !
Expand Down Expand Up @@ -774,6 +778,11 @@ private boolean refillBuffer(final boolean mustSucceed) throws IOException {
bufferSize = (int) Math.min(remain, buffer.length);
if(bufferSize > 0) {
raf.readFully(buffer, 0, bufferSize);
if (READ_SEEK) {
READ_BLOCKS++;
READ_SEEK = false;
}
READ_BYTES += bufferSize;
} else {
bufferSize = -1;
}
Expand Down Expand Up @@ -896,6 +905,11 @@ public byte[] readRawBytes(final int size) throws IOException {
final int n;
// osmand change
if(raf != null) {
READ_BYTES += chunk.length - pos;
if (READ_SEEK) {
READ_BLOCKS++;
READ_SEEK = false;
}
raf.readFully(chunk, pos, chunk.length - pos);
n = chunk.length - pos;
} else {
Expand Down Expand Up @@ -960,6 +974,7 @@ public void skipRawBytes(final long size) throws IOException {
if(raf != null) {
bufferPos = 0;
bufferSize = 0;
READ_SEEK = true;
raf.seek(raf.getFilePointer() + (size - pos));
totalBytesRetired = raf.getFilePointer();
} else {
Expand All @@ -985,6 +1000,7 @@ public void seek(long pointer) throws IOException {
}
bufferPos = (int) (pointer - totalBytesRetired);
} else {
READ_SEEK = true;
totalBytesRetired = pointer;
bufferSizeAfterLimit = 0;
raf.seek(pointer);
Expand Down
41 changes: 32 additions & 9 deletions OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public class BinaryMapIndexReader {
public static final int SHIFT_COORDINATES = 5;
public static final int LABEL_ZOOM_ENCODE = 31 - SHIFT_COORDINATES;
private final static Log log = PlatformUtil.getLog(BinaryMapIndexReader.class);
public static int DEPTH_CACHE = 7;
public static boolean READ_STATS = false;
public static final SearchPoiTypeFilter ACCEPT_ALL_POI_TYPE_FILTER = new SearchPoiTypeFilter() {
@Override
Expand Down Expand Up @@ -987,13 +988,7 @@ public List<BinaryMapDataObject> searchMapIndex(SearchRequest<BinaryMapDataObjec
}

for (MapTree tree : index.trees) {
if (tree.right < req.left || tree.left > req.right || tree.top > req.bottom || tree.bottom < req.top) {
continue;
}
codedIS.seek(tree.filePointer);
long oldLimit = codedIS.pushLimitLong((long) tree.length);
searchMapTreeBounds(tree, index, req, foundSubtrees);
codedIS.popLimit(oldLimit);
searchMapTreeBoundsCache(tree, index, req, foundSubtrees);
}

Collections.sort(foundSubtrees, new Comparator<MapTree>() {
Expand Down Expand Up @@ -1098,6 +1093,24 @@ protected void readMapDataBlocks(SearchRequest<BinaryMapDataObject> req, MapTree
}

}


protected void searchMapTreeBoundsCache(MapTree current, MapTree parent,
SearchRequest<BinaryMapDataObject> req, List<MapTree> foundSubtrees) throws IOException {
if (current.right < req.left || current.left > req.right || current.top > req.bottom || current.bottom < req.top) {
return;
}
if (current.children != null) {
for (MapTree ch : current.children) {
searchMapTreeBoundsCache(ch, current, req, foundSubtrees);
}
} else {
codedIS.seek(current.filePointer);
long oldLimit = codedIS.pushLimitLong((long) current.length);
searchMapTreeBounds(current, parent, req, foundSubtrees);
codedIS.popLimit(oldLimit);
}
}

protected void searchMapTreeBounds(MapTree current, MapTree parent,
SearchRequest<BinaryMapDataObject> req, List<MapTree> foundSubtrees) throws IOException {
Expand Down Expand Up @@ -1152,16 +1165,23 @@ protected void searchMapTreeBounds(MapTree current, MapTree parent,
break;
case MapDataBox.BOXES_FIELD_NUMBER :
// left, ... already initialized
if (current.depth < DEPTH_CACHE && current.children == null) {
current.children = new ArrayList<>();
}
MapTree child = new MapTree();
child.length = readInt();
child.depth = current.depth + 1;
child.filePointer = codedIS.getTotalBytesRead();
long oldLimit = codedIS.pushLimitLong((long) child.length);
if(current.ocean != null ){
if (current.ocean != null) {
child.ocean = current.ocean;
}
searchMapTreeBounds(child, current, req, foundSubtrees);
codedIS.popLimit(oldLimit);
codedIS.seek(child.filePointer + child.length);
if (current.children != null) {
current.children.add(child);
}
break;
default:
skipUnknownField(t);
Expand Down Expand Up @@ -2232,12 +2252,15 @@ private static class MapTree {

long mapDataBlock = 0;
Boolean ocean = null;
int depth;

int left = 0;
int right = 0;
int top = 0;
int bottom = 0;

List<MapTree> children = null;


public int getLeft() {
return left;
}
Expand Down
Loading