Derby
  1. Derby
  2. DERBY-2442

Remove code made redundant by DERBY-681

    Details

    • Type: Task Task
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 10.3.1.4
    • Fix Version/s: 10.3.1.4
    • Component/s: SQL
    • Labels:
      None

      Description

      The instance variables, generatedForGroupByClause and generatedForHavingClause are not set anymore. Investigate code that references these variables to see if it still makes sense in the new dispensation.

      1. post681.refactor2.txt
        13 kB
        Manish Khettry
      2. post681.refactor1.txt
        9 kB
        Manish Khettry
      3. post681.refactor.txt
        5 kB
        Manish Khettry

        Activity

        Hide
        Kristian Waagan added a comment -

        Committed 'post681.refactor2.txt' (removed the spurious letter 's' from SelectNode to avoid a diff) to trunk with revision 520885.
        Ran suites.All/derbyall with Java SE 5.0 and 6.

        Resolving the issue as this is the last patch according to the assignee. Please close the issue when the fix/patch is verifed.

        Show
        Kristian Waagan added a comment - Committed 'post681.refactor2.txt' (removed the spurious letter 's' from SelectNode to avoid a diff) to trunk with revision 520885. Ran suites.All/derbyall with Java SE 5.0 and 6. Resolving the issue as this is the last patch according to the assignee. Please close the issue when the fix/patch is verifed.
        Hide
        Manish Khettry added a comment -

        This is the last patch for this bug.

        Show
        Manish Khettry added a comment - This is the last patch for this bug.
        Hide
        Manish Khettry added a comment -

        ValueNod#clause RIP.

        I ran derbylang, junit-all.

        Show
        Manish Khettry added a comment - ValueNod#clause RIP. I ran derbylang, junit-all.
        Hide
        Manish Khettry added a comment -

        Sorry, to reopen this but there is atleast another set of changes that are coming up. Thanks for the quick review and commit.

        Show
        Manish Khettry added a comment - Sorry, to reopen this but there is atleast another set of changes that are coming up. Thanks for the quick review and commit.
        Hide
        Kristian Waagan added a comment -

        Commited 'post681.refactor.txt' and 'post681.refactor1.txt ' to trunk with revision 519936.
        Ran derbyall and suites.All with Sun JREs 1.5.0 and 1.6.0.

        Thanks Manish.

        Show
        Kristian Waagan added a comment - Commited 'post681.refactor.txt' and 'post681.refactor1.txt ' to trunk with revision 519936. Ran derbyall and suites.All with Sun JREs 1.5.0 and 1.6.0. Thanks Manish.
        Hide
        Manish Khettry added a comment -

        the second patch, performs cleanup on FromSubquery and FromList-- removed instance variables generatedForGroupByClause and generatedForHavingClause. They can be applied together or separately. Ran junit-all and derbylang.

        Show
        Manish Khettry added a comment - the second patch, performs cleanup on FromSubquery and FromList-- removed instance variables generatedForGroupByClause and generatedForHavingClause. They can be applied together or separately. Ran junit-all and derbylang.
        Hide
        Manish Khettry added a comment -

        I'm sorry-- I had two different sets of changes in my environment. If you update to svn # 518687, this patch should compile.

        Show
        Manish Khettry added a comment - I'm sorry-- I had two different sets of changes in my environment. If you update to svn # 518687, this patch should compile.
        Hide
        Kristian Waagan added a comment -

        The patch doesn't compile:
        [javac] java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java:701: cannot find symbol
        [javac] symbol : method getGeneratedForGroupbyClause()
        [javac] location: class org.apache.derby.impl.sql.compile.SelectNode
        [javac] (! select.getGeneratedForGroupbyClause()))
        [javac] ^
        [javac] 1 error

        Please update the patch, and I'll get back to it. Reset patch available flag.

        Show
        Kristian Waagan added a comment - The patch doesn't compile: [javac] java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java:701: cannot find symbol [javac] symbol : method getGeneratedForGroupbyClause() [javac] location: class org.apache.derby.impl.sql.compile.SelectNode [javac] (! select.getGeneratedForGroupbyClause())) [javac] ^ [javac] 1 error Please update the patch, and I'll get back to it. Reset patch available flag.
        Hide
        Kristian Waagan added a comment -

        Patch looks good. I'm running tests, and will commit later today unless anyone objects.
        Removing dead code is important to keep/make the source code understandable.

        Thanks Manish!

        Show
        Kristian Waagan added a comment - Patch looks good. I'm running tests, and will commit later today unless anyone objects. Removing dead code is important to keep/make the source code understandable. Thanks Manish!
        Hide
        Manish Khettry added a comment -

        In SelectNode, the instance variables generatedForGoupByClause and generatedForHavingClause are never set. I have removed these variables as well as code that depends on them being true.

        This is a small and self-contained patch. Hopefully someone can review this sooner than later. After this, the instance variables generatedForGroupByClause/HavingClause in FromSubquery.

        Show
        Manish Khettry added a comment - In SelectNode, the instance variables generatedForGoupByClause and generatedForHavingClause are never set. I have removed these variables as well as code that depends on them being true. This is a small and self-contained patch. Hopefully someone can review this sooner than later. After this, the instance variables generatedForGroupByClause/HavingClause in FromSubquery.

          People

          • Assignee:
            Manish Khettry
            Reporter:
            Manish Khettry
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development