MONDRIAN: Expose query timeout for benefit of olap4j driver; throw an…

… error if requested cell is out of bounds.

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

src/main/mondrian/olap/Query.java

@@ -109,7 +109,7 @@ public class Query extends QueryPart {
     /**
      * Query timeout, in milliseconds
      */
-    private final int queryTimeout;
+    private long queryTimeout;
 
     /**
      * If true, cancel this query
@@ -220,6 +220,17 @@ public Query(
         resolve();
     }
 
+    /**
+     * Sets the timeout in milliseconds of this Query.
+     *
+     * <p>Zero means no timeout.
+     *
+     * @param queryTimeoutMillis Timeout in milliseconds
+     */
+    public void setQueryTimeoutMillis(long queryTimeoutMillis) {
+        this.queryTimeout = queryTimeoutMillis;
+    }
+
     /**
      * Checks whether the property name is present in the query.
      */
@@ -357,7 +368,7 @@ public void checkCancelOrTimeout() {
             long currTime = System.currentTimeMillis();
             if ((currTime - startTime) >= queryTimeout) {
                 throw MondrianResource.instance().QueryTimeout.ex(
-                    (long) queryTimeout / 1000);
+                    queryTimeout / 1000);
             }
         }
         if (outOfMemoryMsg != null) {
@@ -655,15 +666,11 @@ public Object[] getChildren() {
         // Chidren are axes, slicer, and formulas (in that order, to be
         // consistent with replaceChild).
         List<QueryPart> list = new ArrayList<QueryPart>();
-        for (QueryAxis axis : axes) {
-            list.add(axis);
-        }
+        list.addAll(Arrays.asList(axes));
         if (slicerAxis != null) {
             list.add(slicerAxis);
         }
-        for (Formula formula : formulas) {
-            list.add(formula);
-        }
+        list.addAll(Arrays.asList(formulas));
         return list.toArray();
     }
 

src/main/mondrian/rolap/RolapResult.java

@@ -663,6 +663,12 @@ public Cell getCell(int[] pos) {
 
         CellInfo ci = cellInfos.lookup(pos);
         if (ci.value == null) {
+            for (int i = 0; i < pos.length; i++) {
+                int po = pos[i];
+                if (po < 0 || po >= axes[i].getPositions().size()) {
+                    throw Util.newError("coordinates out of range");
+                }
+            }
             ci.value = Util.nullValue;
         }