comit

ninqing · Feb 18, 2014 · d2a8340 · d2a8340
1 parent 62d9b54
commit d2a8340
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/tddl-executor/src/main/java/com/taobao/tddl/executor/cursor/impl/AggregateCursor.java b/tddl-executor/src/main/java/com/taobao/tddl/executor/cursor/impl/AggregateCursor.java
@@ -9,6 +9,8 @@
 
 import com.taobao.tddl.common.exception.TddlException;
 import com.taobao.tddl.common.utils.GeneralUtil;
+import com.taobao.tddl.common.utils.logger.Logger;
+import com.taobao.tddl.common.utils.logger.LoggerFactory;
 import com.taobao.tddl.executor.cursor.IAggregateCursor;
 import com.taobao.tddl.executor.cursor.ICursorMeta;
 import com.taobao.tddl.executor.cursor.ISchematicCursor;
@@ -24,9 +26,6 @@
 import com.taobao.tddl.optimizer.core.expression.IOrderBy;
 import com.taobao.tddl.optimizer.core.expression.ISelectable;
 
-import com.taobao.tddl.common.utils.logger.Logger;
-import com.taobao.tddl.common.utils.logger.LoggerFactory;
-
 /**
  * 用来计算聚合函数，group by
  * 
@@ -238,10 +237,7 @@ private void initSchema() throws TddlException {
             }
         }
         cursorMeta = CursorMetaImp.buildNew(retColumns, retColumns.size());
-        if (logger.isDebugEnabled()) {
-            logger.warn("firstRowSetInCurrentGroup:\n" + firstRowSetInCurrentGroup);
-            logger.warn("cursorMeta:\n" + cursorMeta);
-        }
+
     }
 
     private boolean isCurrentGroupByChanged(IRowSet kv) {

diff --git a/tddl-executor/src/main/java/com/taobao/tddl/executor/rowset/AbstractRowSet.java b/tddl-executor/src/main/java/com/taobao/tddl/executor/rowset/AbstractRowSet.java
@@ -172,10 +172,7 @@ public String toString() {
         for (ColumnMeta cm : this.getParentCursorMeta().getColumns()) {
             int index = this.getParentCursorMeta().getIndex(cm.getTableName(), cm.getName());
 
-            if (index > this.getValues().size()) {
-                System.out.println("11");
-            }
-            sb.append(cm.getName() + ":" + this.getString(index) + " ");
+            sb.append(cm.getName() + ":" + this.getValues().get(index) + " ");
         }
         return sb.toString();
     }