Skip to content

Commit

Permalink
MONDRIAN: Remove spuriour OrConstraint which caused MySQL test differ…
Browse files Browse the repository at this point in the history 
…ence;

    Update test log for Excel function set under JDK 1.4.

[git-p4: depot-paths = "//open/mondrian/": change = 10476]
  • Loading branch information
@julianhyde
julianhyde committed Jan 28, 2008
1 parent 47cf102 commit e6ad25a
Show file tree
Hide file tree
Showing 2 changed files with 210 additions and 8 deletions.
21 changes: 14 additions & 7 deletions testsrc/main/mondrian/rolap/BatchTestCase.java
View file
Expand Up @@ -220,7 +220,9 @@ void assertRequestSql(
if (bomb == null) {
fail("expected query [" + sql + "] did not occur");
}
assertEquals(replaceQuotes(sql), replaceQuotes(bomb.sql));
TestContext.assertEqualsVerbose(
replaceQuotes(sql),
replaceQuotes(bomb.sql));
}

/*
Expand Down Expand Up @@ -627,7 +629,6 @@ BitKey getBitKey(RolapStar star) {

StarPredicate toPredicate(RolapStar star) {
RolapStar.Column starColumn[] = new RolapStar.Column[tables.length];

for (int i = 0; i < tables.length; i++) {
String table = tables[i];
String column = columns[i];
Expand All @@ -639,13 +640,19 @@ StarPredicate toPredicate(RolapStar star) {
assert (values.length == tables.length);
List<StarPredicate> andPredList = new ArrayList<StarPredicate>();
for (int i = 0; i < values.length; i++) {
String value = values[i];
andPredList.add(new ValueColumnPredicate(starColumn[i], value));
andPredList.add(
new ValueColumnPredicate(starColumn[i], values[i]));
}
orPredList.add(new AndPredicate(andPredList));
final StarPredicate predicate =
andPredList.size() == 1
? andPredList.get(0)
: new AndPredicate(andPredList);
orPredList.add(predicate);
}

return (new OrPredicate(orPredList));

return orPredList.size() == 1
? orPredList.get(0)
: new OrPredicate(orPredList);
}
}
}
Expand Down
197 changes: 196 additions & 1 deletion testsrc/main/mondrian/xmla/XmlaBasicTest.ref.xml
View file
Expand Up @@ -18000,6 +18000,24 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>abs</CAPTION>
</row>
<row>
<FUNCTION_NAME>acos</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>acos</CAPTION>
</row>
<row>
<FUNCTION_NAME>acosh</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>acosh</CAPTION>
</row>
<row>
<FUNCTION_NAME>AddCalculatedMembers</FUNCTION_NAME>
<DESCRIPTION>Adds calculated members to a set.</DESCRIPTION>
Expand Down Expand Up @@ -18130,6 +18148,42 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>ascW</CAPTION>
</row>
<row>
<FUNCTION_NAME>asin</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>asin</CAPTION>
</row>
<row>
<FUNCTION_NAME>asinh</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>asinh</CAPTION>
</row>
<row>
<FUNCTION_NAME>atan2</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression, Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>atan2</CAPTION>
</row>
<row>
<FUNCTION_NAME>atanh</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>atanh</CAPTION>
</row>
<row>
<FUNCTION_NAME>atn</FUNCTION_NAME>
<DESCRIPTION/>
Expand Down Expand Up @@ -18421,6 +18475,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>cos</CAPTION>
</row>
<row>
<FUNCTION_NAME>cosh</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>cosh</CAPTION>
</row>
<row>
<FUNCTION_NAME>Count</FUNCTION_NAME>
<DESCRIPTION>Returns the number of tuples in a
Expand Down Expand Up @@ -18686,6 +18749,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>DefaultMember</CAPTION>
</row>
<row>
<FUNCTION_NAME>degrees</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>degrees</CAPTION>
</row>
<row>
<FUNCTION_NAME>Descendants</FUNCTION_NAME>
<DESCRIPTION>Returns the set of descendants of a
Expand Down Expand Up @@ -19216,17 +19288,57 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>hour</CAPTION>
</row>
<row>
<FUNCTION_NAME>IIf</FUNCTION_NAME>
<DESCRIPTION>Returns one of two dimension values
determined by a logical test.</DESCRIPTION>
<PARAMETER_LIST>Logical Expression, Dimension, Dimension</PARAMETER_LIST>
<RETURN_TYPE>12</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>IIf</CAPTION>
</row>
<row>
<FUNCTION_NAME>IIf</FUNCTION_NAME>
<DESCRIPTION>Returns one of two hierarchy values
determined by a logical test.</DESCRIPTION>
<PARAMETER_LIST>Logical Expression, Hierarchy, Hierarchy</PARAMETER_LIST>
<RETURN_TYPE>12</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>IIf</CAPTION>
</row>
<row>
<FUNCTION_NAME>IIf</FUNCTION_NAME>
<DESCRIPTION>Returns one of two level values
determined by a logical test.</DESCRIPTION>
<PARAMETER_LIST>Logical Expression, Level, Level</PARAMETER_LIST>
<RETURN_TYPE>12</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>IIf</CAPTION>
</row>
<row>
<FUNCTION_NAME>IIf</FUNCTION_NAME>
<DESCRIPTION>Returns boolean determined by a
logical test.</DESCRIPTION>
<PARAMETER_LIST>Logical Expression, Logical
Expression, Numeric Expression</PARAMETER_LIST>
Expression, Logical Expression</PARAMETER_LIST>
<RETURN_TYPE>11</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>IIf</CAPTION>
</row>
<row>
<FUNCTION_NAME>IIf</FUNCTION_NAME>
<DESCRIPTION>Returns one of two member values
determined by a logical test.</DESCRIPTION>
<PARAMETER_LIST>Logical Expression, Member, Member</PARAMETER_LIST>
<RETURN_TYPE>12</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>IIf</CAPTION>
</row>
<row>
<FUNCTION_NAME>IIf</FUNCTION_NAME>
<DESCRIPTION>Returns one of two numeric values
Expand All @@ -19238,6 +19350,16 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>IIf</CAPTION>
</row>
<row>
<FUNCTION_NAME>IIf</FUNCTION_NAME>
<DESCRIPTION>Returns one of two set values
determined by a logical test.</DESCRIPTION>
<PARAMETER_LIST>Logical Expression, Set, Set</PARAMETER_LIST>
<RETURN_TYPE>12</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>IIf</CAPTION>
</row>
<row>
<FUNCTION_NAME>IIf</FUNCTION_NAME>
<DESCRIPTION>Returns one of two string values
Expand Down Expand Up @@ -19704,6 +19826,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>log</CAPTION>
</row>
<row>
<FUNCTION_NAME>log10</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>log10</CAPTION>
</row>
<row>
<FUNCTION_NAME>lTrim</FUNCTION_NAME>
<DESCRIPTION/>
Expand Down Expand Up @@ -20176,6 +20307,16 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>Parent</CAPTION>
</row>
<row>
<FUNCTION_NAME>Percentile</FUNCTION_NAME>
<DESCRIPTION>Returns the value of the tuple that
is at a given percentile of a set.</DESCRIPTION>
<PARAMETER_LIST>Set, Numeric Expression, Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>Percentile</CAPTION>
</row>
<row>
<FUNCTION_NAME>PeriodsToDate</FUNCTION_NAME>
<DESCRIPTION>Returns a set of periods (members)
Expand Down Expand Up @@ -20209,6 +20350,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>PeriodsToDate</CAPTION>
</row>
<row>
<FUNCTION_NAME>pi</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST/>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>pi</CAPTION>
</row>
<row>
<FUNCTION_NAME>pmt</FUNCTION_NAME>
<DESCRIPTION/>
Expand All @@ -20220,6 +20370,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>pmt</CAPTION>
</row>
<row>
<FUNCTION_NAME>power</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression, Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>power</CAPTION>
</row>
<row>
<FUNCTION_NAME>PrevMember</FUNCTION_NAME>
<DESCRIPTION>Returns the previous member in the
Expand Down Expand Up @@ -20272,6 +20431,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>Qtd</CAPTION>
</row>
<row>
<FUNCTION_NAME>radians</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>radians</CAPTION>
</row>
<row>
<FUNCTION_NAME>Rank</FUNCTION_NAME>
<DESCRIPTION>Returns the one-based rank of a
Expand Down Expand Up @@ -20431,6 +20599,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>sin</CAPTION>
</row>
<row>
<FUNCTION_NAME>sinh</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>sinh</CAPTION>
</row>
<row>
<FUNCTION_NAME>space</FUNCTION_NAME>
<DESCRIPTION/>
Expand All @@ -20449,6 +20626,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>sqr</CAPTION>
</row>
<row>
<FUNCTION_NAME>sqrtPi</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>sqrtPi</CAPTION>
</row>
<row>
<FUNCTION_NAME>Stddev</FUNCTION_NAME>
<DESCRIPTION>Alias for Stdev.</DESCRIPTION>
Expand Down Expand Up @@ -20645,6 +20831,15 @@ WHERE ([Time].[1997].[Q2], [Marital Status], [Measures].[Store Sales])
<INTERFACE_NAME/>
<CAPTION>tan</CAPTION>
</row>
<row>
<FUNCTION_NAME>tanh</FUNCTION_NAME>
<DESCRIPTION/>
<PARAMETER_LIST>Numeric Expression</PARAMETER_LIST>
<RETURN_TYPE>5</RETURN_TYPE>
<ORIGIN>1</ORIGIN>
<INTERFACE_NAME/>
<CAPTION>tanh</CAPTION>
</row>
<row>
<FUNCTION_NAME>ThirdQ</FUNCTION_NAME>
<DESCRIPTION>Returns the 3rd quartile value of a
Expand Down

0 comments on commit e6ad25a

Please sign in to comment.