yes git cherry-pick will be your friend to clean the mess On 13 mai 2011, at 16:16, Alex Snaps wrote:
> On Thursday 12 May 2011 at 17:17, Emmanuel Bernard wrote: > I've significantly improved the GridDialect in my quest to use Atomic Maps > for entity and associations. Unfortunately the change is not ready to be > shared yet. I hope to get that out next week Entity are using atomic maps but > not associations yet. > Seems like a big enough change. I'll wait for that to become available before > sharing anything further myself then... > >> Also, I've see you've used merge to sync your work and the main tree. We >> have a linear tree policy, so use rebase instead of merge. > I think this mainly due to me rebasing before rearranging & squashing my > changes. Not so much at ease with git yet... > But I'll find a way to clean that all up nicely when getting to a pull > request. > >> >> On 11 mai 2011, at 15:12, Alex Snaps wrote: >> >>> Hey, >>> I've taken some time and, in an attempt to port Hibernate OGM to use >>> Ehcache instead of Infinispan, abstracted it from Infinispan. >>> As the doc on that task states, I've made all calls use ConcurrentMap >>> (rather than Map actually). I had a little trouble understanding the "Skip >>> locking proposed by Sanne" in >>> OgmTableGenerator.doWorkInCurrentTransactionIfAny, so that this does a >>> simple Map.get now (that might have been a specialization for a Dialect, >>> but couldn't understand what it was all about). >>> And finally introduced a new hibernate.grid.manager prop to instantiate the >>> proper provider... >>> >>> The changes are available here: >>> https://github.com/alexsnaps/hibernate-ogm/commit/d0fcbffed4c4bcc2aa5208c049ca5e870e07424e >>> >>> Hope that can be made useful… I also wanted to start looking into queries >>> next. But I'll send another mail on that later. >>> Thanks, >>> Alex >>> >>> >>> -- >>> Alex Snaps <alex.sn...@gmail.com> >>> Senior Software Engineer - Terracotta >>> http://twitter.com/alexsnaps >>> http://www.linkedin.com/in/alexsnaps >>> >>> _______________________________________________ >>> hibernate-dev mailing list >>> hibernate-dev@lists.jboss.org >>> https://lists.jboss.org/mailman/listinfo/hibernate-dev >> > _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
