[ https://issues.apache.org/jira/browse/CASSANDRA-7981?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14219394#comment-14219394 ]
Benjamin Lerer commented on CASSANDRA-7981: ------------------------------------------- The new fixes are there: [branch | https://github.com/blerer/cassandra/compare/CASSANDRA-7981] {quote}It looks like the mergeWith() conflict is still present. For some reason, the ant build doesn't normally complain, but my IDE does. Either way, it's a legit problem that needs to be fixed.{quote} It is a perfectly valid thing from the Java point of view but I agree that it is a bit of a hack. I have tried to simplify a bit the hierachy by having {{SingleColumnPrimaryKeyRestrictions}} using an instance of {{SingleColumnRestrictions}} instead of extending it. This as allowed me to remove the {{mergeWith()}} problem. {quote}Can you explain why that's correct (and add a comment)?{quote} I cannot. This code is completly wrong. Hopefully it should now be fixed. Have a look at the new unit tests and tell me if they look fine to you. > Refactor SelectStatement > ------------------------ > > Key: CASSANDRA-7981 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7981 > Project: Cassandra > Issue Type: Bug > Reporter: Benjamin Lerer > Assignee: Benjamin Lerer > Fix For: 3.0 > > > The current state of the code of SelectStatement make fixing some issues or > adding new functionnalities really hard. It also contains some > functionnalities that we would like to reuse in ModificationStatement but > cannot for the moment. > Ideally I would like to: > * Perform as much validation as possible on Relations instead of performing > it on Restrictions as it will help for problem like the one of > #CASSANDRA-6075 (I believe that by clearly separating validation and > Restrictions building we will also make the code a lot clearer) > * Provide a way to easily merge restrictions on the same columns as needed > for #CASSANDRA-7016 > * Have a preparation logic (validation + pre-processing) that we can easily > reuse for Delete statement #CASSANDRA-6237 > * Make the code much easier to read and safer to modify. -- This message was sent by Atlassian JIRA (v6.3.4#6332)