瀏覽代碼

remove logging

Chris Bannister 10 年之前
父節點
當前提交
d4ed5236ce
共有 2 個文件被更改,包括 2 次插入13 次删除
  1. 1 9
      conn.go
  2. 1 4
      frame.go

+ 1 - 9
conn.go

@@ -336,8 +336,6 @@ func (c *Conn) exec(req frameWriter, tracer Tracer) (frame, error) {
 	}
 
 	// resp is basically a waiting semaphore protecting the framer
-
-	// log.Printf("%v: OUT stream=%d (%T) req=%v\n", c.conn.LocalAddr(), stream, req, req)
 	framer := newFramer(c, c, c.compressor, c.version)
 	defer framerPool.Put(framer)
 
@@ -348,7 +346,7 @@ func (c *Conn) exec(req frameWriter, tracer Tracer) (frame, error) {
 	}
 
 	// there is a race that we can read and write to the same buffer, I dont think
-	// the data will actually corrupt but to be safe and apepase the race detector gods,
+	// the data will actually corrupt but to be safe and appease the race detector gods,
 	// guard it.
 	// We could fix this by using seperate read and write buffers, which may end up
 	// being faster and easier to reason about.
@@ -376,7 +374,6 @@ func (c *Conn) exec(req frameWriter, tracer Tracer) (frame, error) {
 	if len(framer.traceID) > 0 {
 		tracer.Trace(framer.traceID)
 	}
-	// log.Printf("%v: IN stream=%d (%T) resp=%v\n", c.conn.LocalAddr(), stream, frame, frame)
 
 	return frame, nil
 }
@@ -414,7 +411,6 @@ func (c *Conn) prepareStatement(stmt string, trace Tracer) (*resultPreparedFrame
 
 	switch x := resp.(type) {
 	case *resultPreparedFrame:
-		// log.Printf("prepared %q => %x\n", stmt, x.preparedID)
 		flight.info = x
 	case error:
 		flight.err = x
@@ -444,7 +440,6 @@ func (c *Conn) executeQuery(qry *Query) *Iter {
 	if qry.pageSize > 0 {
 		params.pageSize = qry.pageSize
 	}
-	// log.Printf("%+#v\n", qry)
 
 	var frame frameWriter
 	if qry.shouldPrepare() {
@@ -502,8 +497,6 @@ func (c *Conn) executeQuery(qry *Query) *Iter {
 		return &Iter{err: err}
 	}
 
-	// log.Printf("resp=%T\n", resp)
-
 	switch x := resp.(type) {
 	case *resultVoidFrame:
 		return &Iter{}
@@ -513,7 +506,6 @@ func (c *Conn) executeQuery(qry *Query) *Iter {
 			rows:    x.rows,
 		}
 
-		// log.Printf("result meta=%v\n", x.meta)
 		if len(x.meta.pagingState) > 0 {
 			iter.next = &nextIter{
 				qry: *qry,

+ 1 - 4
frame.go

@@ -484,7 +484,6 @@ func (f *framer) finishWrite() error {
 	f.setLength(length)
 
 	_, err := f.w.Write(f.buf)
-	// log.Printf("OUT wrote=%d header=% X\n", n, f.buf[:f.headSize])
 
 	f.buf = f.buf[:0]
 	if err != nil {
@@ -633,7 +632,6 @@ func (f *framer) parseResultMetadata() resultMetadata {
 		table = f.readString()
 	}
 
-	// log.Printf("flags=% X keyspace=%s table=%s\n", meta.flags, keyspace, table)
 	cols := make([]ColumnInfo, colCount)
 
 	for i := 0; i < colCount; i++ {
@@ -691,12 +689,11 @@ type resultRowsFrame struct {
 }
 
 func (f *resultRowsFrame) String() string {
-	return "[result_rows]"
+	return fmt.Sprintf("[result_rows meta=%v]", f.meta)
 }
 
 func (f *framer) parseResultRows() frame {
 	meta := f.parseResultMetadata()
-	// log.Printf("parsed meta=%v\n", meta)
 
 	numRows := f.readInt()
 	colCount := len(meta.columns)