db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Knut Anders Hatlen <Knut.Hat...@Sun.COM>
Subject Re: [jira] Commented: (DERBY-504) SELECT DISTINCT returns duplicates when selecting from subselects
Date Thu, 01 Sep 2005 16:23:35 GMT
"Rick Hillegas (JIRA)" <derby-dev@db.apache.org> writes:

>     [ http://issues.apache.org/jira/browse/DERBY-504?page=comments#action_12320805 ]

> Rick Hillegas commented on DERBY-504:
> -------------------------------------
> The patch seems to be broken. I can't apply the changes to the j2me canons. Here's the
output from applying the patch:
> patching file java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
> patching file java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
> patching file java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
> patching file java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
> patching file java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
> patching file java/testing/org/apache/derbyTesting/functionTests/tests/lang/distinct.sql
> patching file java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out
> patching file java/testing/org/apache/derbyTesting/functionTests/master/distinct.out
> patching file java/testing/org/apache/derbyTesting/functionTests/master/j9_13/distinct.out
> patching file java/testing/org/apache/derbyTesting/functionTests/master/j9_13/groupBy.out
> patching file java/testing/org/apache/derbyTesting/functionTests/master/j9_22/distinct.out
> Hunk #1 FAILED at 2477.
> 1 out of 1 hunk FAILED -- saving rejects to file java/testing/org/apache/derbyTesting/functionTests/master/j9_22/distinc
> t.out.rej
> patching file java/testing/org/apache/derbyTesting/functionTests/master/j9_22/groupBy.out
> Hunk #1 FAILED at 293.
> 1 out of 1 hunk FAILED -- saving rejects to file java/testing/org/apache/derbyTesting/functionTests/master/j9_22/groupBy
> .out.rej

I think this is a windows/unix newline issue. All the files that were
successfully patched have the svn:eol-style property set to 'native'
(and since I created the patch on Solaris, they have unix
newlines). The two that failed do not have that property, and they
have windows (cr-lf) newlines. I guess your (windows?) patch tool got
confused when it found lines with different end-of-line style in the
same diff.

I'll submit a new patch with windows line terminators. If that doesn't
work, we'll just have to wait until Dyre has fixed DERBY-330.

Knut Anders

View raw message