MONDRIAN: Use Apache logging

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

src/main/mondrian/jolap/util/Model.java

@@ -20,6 +20,8 @@
 import java.lang.reflect.Modifier;
 import java.util.*;
 
+import org.apache.log4j.Logger;
+
 /**
  * <code>Model</code> attempts to deduce an object model consisting of
  * entities, attributes and relationships using Java reflection.
@@ -29,6 +31,8 @@
  * @version $Id$
  **/
 public class Model {
+    private static final Logger LOGGER = Logger.getLogger(Model.class);
+
     private static Model instance;
     private HashMap mapClassToEntity = new HashMap();
     private static final Entity noEntity = new Entity(null, Object.class);
@@ -387,7 +391,7 @@ private Relationship computeInverse() {
             if (candidateCount == 1) {
                 return (Relationship) candidate;
             } else {
-                System.out.println("Found " + candidateCount + " candidates for inverse of " + this);
+            	LOGGER.debug("Found " + candidateCount + " candidates for inverse of " + this);
                 return null;
             }
         }
@@ -428,12 +432,12 @@ public static void foo(Object o) {
         final Attribute[] attributes = entity.getAttributes();
         for (int i = 0; i < attributes.length; i++) {
             Attribute attribute = attributes[i];
-            System.out.println("Attribute: " + attribute.getDescription());
-        }
+            LOGGER.debug("Attribute: " + attribute.getDescription());
+                    }
         final Relationship[] relationships = entity.getRelationships();
         for (int i = 0; i < relationships.length; i++) {
             Relationship relationship = relationships[i];
-            System.out.println("Relationship: " + relationship.getDescription());
+            LOGGER.debug("Relationship: " + relationship.getDescription());
         }
     }
 

src/main/mondrian/olap/MondrianProperties.java

@@ -527,7 +527,7 @@ else if (populateCount == 0 && false) {
 
     /**
      * Tries to load properties from a URL. Does not fail, just prints success
-     * or failure to {@link System#out}.
+     * or failure to log.
      */
     private void load(final URL url) {
         try {

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

@@ -19,11 +19,14 @@
 import java.util.*;
 import java.util.Set;
 
+import org.apache.log4j.Logger;
+
 /**
  * <code>FunUtil</code> contains a set of methods useful within the
  * <code>mondrian.olap.fun</code> package.
  **/
 public class FunUtil extends Util {
+
     static final String[] emptyStringArray = new String[0];
 
     /**
@@ -1664,6 +1667,7 @@ private static Member getDescendant(SchemaReader schemaReader,
 }
 
 abstract class MemberComparator implements Comparator {
+    private static final Logger LOGGER = Logger.getLogger(MemberComparator.class);
     Map mapMemberToValue;
     private boolean desc;
 
@@ -1677,13 +1681,11 @@ public int compare(Object o1, Object o2) {
         Member m1 = (Member) o1,
                 m2 = (Member) o2;
         int c = compareInternal(m1, m2);
-        if (false) {
-            System.out.println(
+        LOGGER.debug(
                     "compare " +
                     m1.getUniqueName() + "(" + mapMemberToValue.get(m1) + "), " +
                     m2.getUniqueName() + "(" + mapMemberToValue.get(m2) + ")" +
                     " yields " + c);
-        }
         return c;
     }
 
@@ -1759,6 +1761,7 @@ protected int compareInternal(Member m1, Member m2) {
  * Compares tuples, which are represented as arrays of {@link Member}s.
  */
 abstract class ArrayComparator implements Comparator {
+    private static final Logger LOGGER = Logger.getLogger(ArrayComparator.class);
     int arity;
 
     ArrayComparator(int arity) {
@@ -1781,11 +1784,9 @@ public int compare(Object o1, Object o2) {
         final Member[] a1 = (Member[]) o1;
         final Member[] a2 = (Member[]) o2;
         final int c = compare(a1, a2);
-        if (false) {
-            System.out.println(
+        LOGGER.debug(
                     "compare {" + toString(a1)+ "}, {" + toString(a2) + "}" +
                     " yields " + c);
-        }
         return c;
     }
 

src/main/mondrian/rolap/FastBatchingCellReader.java

@@ -175,7 +175,7 @@ void setDirty(boolean dirty) {
     }
 
     class Batch {
-
+    	private final Logger LOGGER = Logger.getLogger(Batch.class);
         final RolapStar.Column[] columns;
         final BitKey bitKey;
         final List measuresList = new ArrayList();
@@ -212,19 +212,19 @@ void loadAggregation() {
                     buf.append("AggGen: Sorry, can not create SQL for virtual Cube \"");
                     buf.append(FastBatchingCellReader.this.cube.getName());
                     buf.append("\", operation not currently supported");
-                    System.out.println(buf.toString());
+                    LOGGER.error(buf.toString());
 
                 } else {
                     mondrian.rolap.aggmatcher.AggGen aggGen = 
                         new mondrian.rolap.aggmatcher.AggGen(
                             FastBatchingCellReader.this.cube.getStar(), columns);
                     if (aggGen.isReady()) {
-                        System.out.println(aggGen.createLost());
-                        System.out.println(aggGen.insertIntoLost());
-                        System.out.println(aggGen.createCollapsed());
-                        System.out.println(aggGen.insertIntoCollapsed());
+                    	LOGGER.debug("createLost=" + Util.nl + aggGen.createLost());
+                    	LOGGER.debug("insertIntoLost=" + Util.nl + aggGen.insertIntoLost());
+                    	LOGGER.debug("createCollapsed=" + Util.nl + aggGen.createCollapsed());
+                    	LOGGER.debug("insertIntoCollapsed=" + Util.nl + aggGen.insertIntoCollapsed());
                     } else {
-                        System.out.println("AggGen failed");
+                    	LOGGER.error("AggGen failed");
                     }
                 }
             }

src/main/mondrian/rolap/RolapCube.java

@@ -828,23 +828,24 @@ void registerDimension(Dimension dimension) {
                 // there is a single dimension table, then this is currently
                 // an unsupported configuation and all bets are off.
                 if (relation instanceof MondrianDef.Join) {
-// RME
-// take out after things seem to be working
-MondrianDef.Relation relationTmp1 = relation;
+
+                    // RME
+                    // take out after things seem to be working
+                    MondrianDef.Relation relationTmp1 = relation;
 
                     relation = reorder(relation, levels);
-
-if (relation == null) {
-System.out.println("RolapCube.registerDimension: after reorder relation==null");
-System.out.println("RolapCube.registerDimension: reorder relationTmp1="
-+format(relationTmp1));
-}
+					
+                    if (relation == null && getLogger().isDebugEnabled()) {
+                    	getLogger().debug("RolapCube.registerDimension: after reorder relation==null");
+                    	getLogger().debug("RolapCube.registerDimension: reorder relationTmp1="
+                    						+format(relationTmp1));
+                    }
                 }
 
-MondrianDef.Relation relationTmp2 = relation;
+                MondrianDef.Relation relationTmp2 = relation;
 
                 if (levelName != null) {
-//System.out.println("RolapCube.registerDimension: levelName=" +levelName);
+                    //System.out.println("RolapCube.registerDimension: levelName=" +levelName);
                     // When relation is a table, this does nothing. Otherwise
                     // it tries to arrange the joins so that the fact table
                     // in the RolapStar will be joining at the lowest level.
@@ -878,11 +879,12 @@ void registerDimension(Dimension dimension) {
                             String tableName = childLevel.getTableName();
                             if (tableName != null) {
                                 relation = snip(relation, tableName);
-if (relation == null) {
-System.out.println("RolapCube.registerDimension: after snip relation==null");
-System.out.println("RolapCube.registerDimension: snip relationTmp2="
-+format(relationTmp2));
-}
+
+                                if (relation == null && getLogger().isDebugEnabled()) {
+                                    getLogger().debug("RolapCube.registerDimension: after snip relation==null");
+                                    getLogger().debug("RolapCube.registerDimension: snip relationTmp2="
+                                            +format(relationTmp2));
+                                }
                             }
                         }
                     }
@@ -1642,7 +1644,7 @@ public OlapElement lookupChild(SchemaReader schemaReader, String s) {
     // implement NameResolver
     public OlapElement lookupChild(OlapElement parent, String s) {
         // use OlapElement's virtual lookup
-System.out.println("RolapCube.lookupChild OlapElement: DOES THIS EVER GET CALLED s="+s);
+    	getLogger().error("RolapCube.lookupChild OlapElement: DOES THIS EVER GET CALLED s="+s);
         return parent.lookupChild(getSchemaReader(), s);
     }
 

src/main/mondrian/rolap/RolapStar.java

@@ -23,6 +23,9 @@
 import mondrian.rolap.sql.SqlQuery;
 
 import javax.sql.DataSource;
+
+import org.apache.log4j.Logger;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.sql.Connection;
@@ -1528,6 +1531,8 @@ public boolean containsColumn(String columnName) {
     }
 
     public static class Condition {
+    	private static final Logger LOGGER = Logger.getLogger(Condition.class);
+
         private final MondrianDef.Expression left;
         private final MondrianDef.Expression right;
         // set in Table constructor
@@ -1541,7 +1546,7 @@ public static class Condition {
             if (!(left instanceof MondrianDef.Column)) {
                 // TODO: Will this ever print?? if not then left should be
                 // of type MondrianDef.Column.
-                System.out.println("Condition.left NOT Column: "
+                LOGGER.debug("Condition.left NOT Column: "
                     +left.getClass().getName());
             }
             this.left = left;

src/main/mondrian/rolap/agg/AggQuerySpec.java

@@ -18,6 +18,8 @@
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 
+import org.apache.log4j.Logger;
+
 /**
  * An AggStar's version of the QuerySpec.
  *
@@ -28,6 +30,7 @@
  * @version
  */
 class AggQuerySpec {
+    private final Logger LOGGER = Logger.getLogger(AggQuerySpec.class);
     private final AggStar aggStar;
     private final Segment[] segments;
     /**
@@ -84,10 +87,10 @@ public AggStar.Table.Column getColumn(final int i) {
         int bitPos = columns[i].getBitPosition();
         AggStar.Table.Column column = aggStar.lookupColumn(bitPos);
 
-// this should never happen
-if (column == null) {
-    System.out.println("column null for bitPos="+bitPos);
-}
+        // this should never happen
+        if (column == null) {
+            LOGGER.error("column null for bitPos="+bitPos);
+        }
         return column;
     }
     public String getColumnAlias(final int i) {

src/main/mondrian/rolap/aggmatcher/AggStar.java

@@ -263,14 +263,15 @@ public abstract class Table {
          * table that owns the join condition).
          */
         public class JoinCondition {
+        	private final Logger LOGGER = Logger.getLogger(JoinCondition.class);
             // I think this is always a MondrianDef.Column
             private final MondrianDef.Expression left;
             private final MondrianDef.Expression right;
 
             private JoinCondition(final MondrianDef.Expression left,
                                   final MondrianDef.Expression right) {
                 if (!(left instanceof MondrianDef.Column)) {
-                    System.out.println("JoinCondition.left NOT Column: "
+                    LOGGER.debug("JoinCondition.left NOT Column: "
                         +left.getClass().getName());
                 }
                 this.left = left;

src/main/mondrian/rolap/aggmatcher/AggTableManager.java

@@ -80,7 +80,11 @@ public void initialize() {
         printResults();
     }
     private void printResults() {
-        if (getLogger().isInfoEnabled()) {
+/*
+ *   This was too much information at the INFO level, compared to the
+ *   rest of Mondrian
+ *   
+ *         if (getLogger().isInfoEnabled()) {
             // print just Star table alias and AggStar table names
             StringBuffer buf = new StringBuffer(1024);
             buf.append(Util.nl);
@@ -97,7 +101,9 @@ private void printResults() {
             }
             getLogger().info(buf.toString());
 
-        } else if (getLogger().isDebugEnabled()) {
+        } else
+*/      
+    	if (getLogger().isDebugEnabled()) {
             // print everything, Star, subTables, AggStar and subTables
             // could be a lot
             StringBuffer buf = new StringBuffer(4096);

src/main/mondrian/rolap/aggmatcher/Recognizer.java

@@ -19,6 +19,8 @@
 
 import java.util.*;
 
+import org.apache.log4j.Logger;
+
 /**
  * Abstract Recognizer class used to determine if a candidate aggregate table
  * has the column categories: "fact_count" column, measure columns, foreign key
@@ -39,7 +41,7 @@
 abstract class Recognizer {
 
     private static final MondrianResource mres = MondrianResource.instance();
-
+    private static final Logger LOGGER = Logger.getLogger(Recognizer.class);
     /**
      * This is used to wrap column name matching rules.
      */
@@ -561,12 +563,12 @@ boolean inNotSeenForeignKeys(String foreignKey, List notSeenForeignKeys) {
      * @param notSeenForeignKeys
      */
     private void printNotSeenForeignKeys(List notSeenForeignKeys) {
-        System.out.println("Recognizer.printNotSeenForeignKeys: "
+        LOGGER.debug("Recognizer.printNotSeenForeignKeys: "
             + aggTable.getName());
         for (Iterator it = notSeenForeignKeys.iterator(); it.hasNext(); ) {
             JdbcSchema.Table.Column.Usage usage =
                 (JdbcSchema.Table.Column.Usage) it.next();
-            System.out.println("  " + usage.getColumn().getName());
+            LOGGER.debug("  " + usage.getColumn().getName());
         }
     }
 

src/main/mondrian/web/taglib/DOMBuilder.java

@@ -12,6 +12,8 @@
 package mondrian.web.taglib;
 
 import mondrian.olap.*;
+
+import org.apache.log4j.Logger;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -24,13 +26,17 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
 import java.io.StringReader;
 
 /**
  * transforms a mondrian result into a DOM
  */
 public class DOMBuilder {
-
+    private static final Logger LOGGER = Logger.getLogger(DOMBuilder.class);
+
     Document factory;
     Result result;
     int dimCount;
@@ -331,7 +337,9 @@ public static void debug(Document doc) {
             StringReader input = new StringReader(PRETTY_PRINTER);
             //File input = new File(System.getProperty("test.dir") + "/" + "pretty.xsl");
             Templates templates = tf.newTemplates(new StreamSource(input));
-            templates.newTransformer().transform(new DOMSource(doc), new StreamResult(System.out));
+            OutputStream result = new ByteArrayOutputStream();
+            templates.newTransformer().transform(new DOMSource(doc), new StreamResult(result));
+            LOGGER.debug(result.toString());
         }
         catch (Exception e) {
             e.printStackTrace();