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.

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

ISPN-8517 Lazily ressurect ice fromMemory #5583

Merged
merged 2 commits into from Nov 29, 2017

Conversation

wburns
Copy link
Member

@wburns wburns commented Nov 9, 2017

  • Reuse address pointer for compute remove
  • Don't resurrect value if not needed

https://issues.jboss.org/browse/ISPN-8517
https://issues.jboss.org/browse/ISPN-8500

This issue now also includes objects that are expired are not read.

@wburns
Copy link
Member Author

wburns commented Nov 9, 2017

This should cherry pick as is into 9.1.x as well.

@wburns
Copy link
Member Author

wburns commented Nov 13, 2017

Test failure is unrelated.

@wburns
Copy link
Member Author

wburns commented Nov 15, 2017

Added in changes from #5567

@wburns wburns force-pushed the ISPN-8517_less_ice_offheap branch 2 times, most recently from 97fb11e to d9574c6 Compare November 16, 2017 15:33
@wburns
Copy link
Member Author

wburns commented Nov 16, 2017

Looks like CI failures were from the random tx failures in #5591. I have rebased and letting CI run again.

Copy link
Member

@danberindei danberindei left a comment

Choose a reason for hiding this comment

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

Looks fine except for javadoc and parameters() in the test. Also needs rebase.

@@ -359,6 +360,78 @@ public boolean equalsKey(long address, WrappedBytes wrappedBytes) {
return true;
}

/**
* Returns whether entry is expired or not.
* @param address the address of the entry's key to check
Copy link
Member

Choose a reason for hiding this comment

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

Isn't it the address of the entry?

@@ -359,6 +360,78 @@ public boolean equalsKey(long address, WrappedBytes wrappedBytes) {
return true;
}

/**
* Returns whether entry is expired or not.
Copy link
Member

Choose a reason for hiding this comment

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

Seems redundant.

}

protected void afterCacheCreated(EmbeddedCacheManager cm) {

}

public void testSimpleExpirationLifespan() throws Exception {
public ExpirationFunctionalTest withStorage(StorageType storage) {
Copy link
Member

Choose a reason for hiding this comment

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

Needs parameters().

timeService.advance(2);

for (int i = 0; i < SIZE; i++) {
cache.getAdvancedCache().getDataContainer().executeTask(KeyFilter.ACCEPT_ALL_FILTER, (k, ice) -> { throw new RuntimeException("No task should be executed on expired entry"); });
Copy link
Member

Choose a reason for hiding this comment

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

The lambda could be on its own line.

* Reuse address pointer for compute remove
* Don't resurrect value if not needed
@wburns
Copy link
Member Author

wburns commented Nov 29, 2017

Okay this has been updated and also fixes the REST failures on master.

@tristantarrant tristantarrant merged commit 35fd0a7 into infinispan:master Nov 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants