Skip to content

fix after merge #42

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
xxlaykxx merged 1 commit into from
Jul 30, 2023
Merged

fix after merge #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions ...gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JavaSecondaryCacheInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public BufferResult(long address, long size) {

}

<<<<<<< HEAD
/**
* Get from the secondary cache using the key buffer.
* @param keyBufAddr address of the key buffer
Expand All @@ -58,11 +57,6 @@ public BufferResult(long address, long size) {
* release the buffer associated with the given address.
*/
void releaseBufferResult(long address);
=======
BufferResult getSecondaryCache(long addr, long size);

void setSecondaryCache(long addrExpr, long sizeExpr, long addr, long size);
>>>>>>> 5ed2f61a9 (Add a Secondary Cache to cache gandiva object code)

}