MONDRIAN

   Fixed code so that passed test with jdk1.4 (when 
   running with java4, functions will not return Iterables).
   Added mondrian.util.UnsupportedList which is basically
   a List<T> implementation where all methods throw the
   UnsupportedOperationException (since there were four
   places in the existing code that could use it).
   RolapResult.executeStripe no longer access the Axis
   List<Position>'s 'size' and 'get' methods. The
   mondrian.rolap.Modulos class now is lazily created
   in RolapResult. Lastly, the build target test-nobuild
   now directly depends upon the set.connectString target.

[git-p4: depot-paths = "//open/mondrian/": change = 8534]

build.xml

@@ -449,6 +449,7 @@ META-INF/**"/>
   </target>
 
   <target name="test-nobuild"
+      depends="set.connectString"
       description="
 Runs all JUnit tests, using the given database connection
 in {mondrian.foodmart.jdbcURL}.">

src/main/mondrian/calc/impl/GenericCalc.java

@@ -12,7 +12,10 @@
 import mondrian.olap.*;
 import mondrian.olap.fun.FunUtil;
 import mondrian.calc.*;
+import mondrian.util.UnsupportedList;
 
+import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,11 +37,35 @@ protected GenericCalc(Exp exp) {
     }
 
     public List evaluateList(Evaluator evaluator) {
-        return (List) evaluate(evaluator);
+        Object o = evaluate(evaluator);
+        if (o instanceof List) {
+            return (List) o;
+        } else {
+            // Iterable
+            final Iterable iter = (Iterable) o;
+            Iterator it = iter.iterator();
+            List list = new ArrayList<Object>();
+            while (it.hasNext()) {
+                list.add(it.next());
+            }
+            return list;
+        }
+        //return (List) evaluate(evaluator);
     }
 
     public Iterable evaluateIterable(Evaluator evaluator) {
-        return (Iterable) evaluate(evaluator);
+        Object o = evaluate(evaluator);
+        if (o instanceof Iterable) {
+            return (Iterable) o;
+        } else {
+            final List list = (List) o;
+            // for java4 must convert List into an Iterable
+            return new Iterable() {
+                public Iterator iterator() {
+                    return list.iterator();
+                }
+            };
+        }
     }
 
     public String evaluateString(Evaluator evaluator) {

src/main/mondrian/olap/Util.java

@@ -77,7 +77,7 @@ public class Util extends XOMUtil {
      * <p>If this variable is true, we will be running retroweaver. Retroweaver
      * has some problems involving {@link java.util.EnumSet}.
      */
-    private static final boolean PreJdk15 =
+    public static final boolean PreJdk15 =
         System.getProperty("java.version").startsWith("1.4");
 
     public static boolean isNull(Object o) {

src/main/mondrian/olap/fun/CountFunDef.java

@@ -46,13 +46,6 @@ public CountFunDef(FunDef dummyFunDef) {
     }
 
     public Calc compileCall(ResolvedFunCall call, ExpCompiler compiler) {
-/*
-//RME
-        ResultStyle[] rs = compiler.getAcceptableResultStyles();
-for (int i = 0; i < rs.length; i++) {
-System.out.println("CountFunDef.compileCall: "+rs[i]);
-}
-*/
         final Calc calc = compiler.compile(call.getArg(0), 
                                 ExpCompiler.ITERABLE_ANY_RESULT_STYLE_ARRAY
                                 );
@@ -63,6 +56,19 @@ public Calc compileCall(ResolvedFunCall call, ExpCompiler compiler) {
         return new AbstractIntegerCalc(
                 call, new Calc[] {calc}) {
             public int evaluateInteger(Evaluator evaluator) {
+/*
+                if (calc instanceof ListCalc) {
+                    ListCalc listCalc = (ListCalc) calc;
+                    List memberList = evaluateCurrentList(listCalc, evaluator);
+                    return count(evaluator, memberList, includeEmpty);
+                } else {
+                    // must be IterCalc
+                    IterCalc iterCalc = (IterCalc) calc;
+                    Iterable iterable =
+                        evaluateCurrentIterable(iterCalc, evaluator);
+                    return count(evaluator, iterable, includeEmpty);
+                }
+*/
                 if (calc instanceof IterCalc) {
                     IterCalc iterCalc = (IterCalc) calc;
                     Iterable iterable =