Skip to content

Commit

Permalink
MONDRIAN: fixing checkFile violations
Browse files Browse the repository at this point in the history
[git-p4: depot-paths = "//open/mondrian/": change = 13099]
  • Loading branch information
Matt Campbell authored and Matt Campbell committed Oct 16, 2009
1 parent 94e99f3 commit 4d1d637
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/main/mondrian/olap/fun/NativizeSetFunDef.java
Expand Up @@ -488,7 +488,8 @@ private Object visitCallArguments(ResolvedFunCall call) {
}

if (exps.length > 1
&& call.getFunDef() instanceof SetFunDef) {
&& call.getFunDef() instanceof SetFunDef)
{
return flattenSetFunDef(call);
}
return null;
Expand Down
4 changes: 2 additions & 2 deletions src/main/mondrian/rolap/RolapNativeSet.java
Expand Up @@ -889,7 +889,7 @@ protected CrossJoinArg[] checkCrossJoinArg(
RolapEvaluator evaluator,
Exp exp)
{
return checkCrossJoinArg(evaluator,exp,false);
return checkCrossJoinArg(evaluator, exp, false);
}

protected CrossJoinArg[] checkCrossJoinArg(
Expand Down Expand Up @@ -935,7 +935,7 @@ protected CrossJoinArg[] checkCrossJoinArg(
if ("NativizeSet".equalsIgnoreCase(fun.getName()) && args.length == 1) {
return checkCrossJoinArg(evaluator, args[0], returnAny);
}
return checkCrossJoin(evaluator, fun, args,returnAny);
return checkCrossJoin(evaluator, fun, args, returnAny);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/mondrian/rolap/sql/SqlQuery.java
Expand Up @@ -444,7 +444,7 @@ public void addWhere(RolapStar.Condition joinCondition) {
String right = joinCondition.getRight().getTableAlias();
if (fromAliases.contains(left) && fromAliases.contains(right)) {
addWhere(joinCondition.getLeft(this),
" = ",joinCondition.getRight(this));
" = ", joinCondition.getRight(this));
}
}

Expand Down
2 changes: 1 addition & 1 deletion testsrc/main/mondrian/rolap/NonEmptyTest.java
Expand Up @@ -3929,7 +3929,7 @@ public void testNativeCrossjoinWillConstrainUsingArgsFromAllAxes() {
+ "group by `time_by_day`.`the_year`, `promotion`.`promotion_name` "
+ "order by 1 ASC, 2 ASC",
623);
assertQuerySql(mdx,new SqlPattern[]{pattern});
assertQuerySql(mdx, new SqlPattern[]{pattern});
}

/**
Expand Down

0 comments on commit 4d1d637

Please sign in to comment.