Optimization (fndome#24)

Author: sim-wangyan

bb.go

@@ -20,5 +20,5 @@ type Bb struct {
 	op    string
 	key   string
 	value interface{}
-	subs  []*Bb
+	subs  []Bb
 }

builder.go

@@ -39,7 +39,7 @@ func NewBuilder(poOrNil Po) *Builder {
 
 func newBuilder() *Builder {
 	b := new(Builder)
-	b.bbs = []*Bb{}
+	b.bbs = []Bb{}
 	return b
 }
 

builder_x.go

@@ -30,14 +30,14 @@ type BuilderX struct {
 	resultKeys            []string
 	sbs                   []*SourceBuilder
 	svs                   []interface{}
-	havings               []*Bb
+	havings               []Bb
 	groupBys              []string
 	isWithoutOptimization bool
 }
 
 func NewBuilderX(po Po, alia string) *BuilderX {
 	x := new(BuilderX)
-	x.bbs = []*Bb{}
+	x.bbs = []Bb{}
 	x.sbs = []*SourceBuilder{}
 	if po != nil {
 		var sb = SourceBuilder{
@@ -92,7 +92,7 @@ func (x *BuilderX) Having(op Op, k string, v interface{}) *BuilderX {
 		key:   k,
 		value: v,
 	}
-	x.havings = append(x.havings, &bb)
+	x.havings = append(x.havings, bb)
 	return x
 }
 

condition_builder.go

@@ -19,14 +19,14 @@ package sqlxb
 import "time"
 
 type ConditionBuilder struct {
-	bbs []*Bb
+	bbs []Bb
 }
 
 type BoolFunc func() bool
 
 func SubCondition() *ConditionBuilder {
 	c := new(ConditionBuilder)
-	c.bbs = []*Bb{}
+	c.bbs = []Bb{}
 	return c
 }
 
@@ -36,7 +36,7 @@ func (builder *ConditionBuilder) X(k string, vs ...interface{}) *ConditionBuilde
 		key:   k,
 		value: vs,
 	}
-	builder.bbs = append(builder.bbs, &bb)
+	builder.bbs = append(builder.bbs, bb)
 	return builder
 }
 
@@ -83,7 +83,7 @@ func (builder *ConditionBuilder) doIn(p string, k string, vs... interface{}) *Co
 		key:   k,
 		value: &ss,
 	}
-	builder.bbs = append(builder.bbs, &bb)
+	builder.bbs = append(builder.bbs, bb)
 
 	return builder
 }
@@ -95,7 +95,7 @@ func (builder *ConditionBuilder) doLike(p string, k string, v string) *Condition
 		key:   k,
 		value: v,
 	}
-	builder.bbs = append(builder.bbs, &bb)
+	builder.bbs = append(builder.bbs, bb)
 
 	return builder
 }
@@ -136,7 +136,7 @@ func (builder *ConditionBuilder) addBb(op string, key string, v interface{}) *Co
 		key:   key,
 		value: v,
 	}
-	builder.bbs = append(builder.bbs, &bb)
+	builder.bbs = append(builder.bbs, bb)
 
 	return builder
 }
@@ -146,7 +146,7 @@ func (builder *ConditionBuilder) null(op string, k string) *ConditionBuilder {
 		op:  op,
 		key: k,
 	}
-	builder.bbs = append(builder.bbs, &bb)
+	builder.bbs = append(builder.bbs, bb)
 	return builder
 }
 
@@ -160,7 +160,7 @@ func (builder *ConditionBuilder) orAndSub(orAnd string, sub *ConditionBuilder) *
 		key:  orAnd,
 		subs: sub.bbs,
 	}
-	builder.bbs = append(builder.bbs, &bb)
+	builder.bbs = append(builder.bbs, bb)
 	return builder
 }
 
@@ -169,14 +169,14 @@ func (builder *ConditionBuilder) orAnd(orAnd string) *ConditionBuilder {
 	if length == 0 {
 		return builder
 	}
-	pre := *(builder.bbs)[length-1]
+	pre := builder.bbs[length-1]
 	if pre.op == OR {
 		return builder
 	}
 	bb := Bb{
 		op: orAnd,
 	}
-	builder.bbs = append(builder.bbs, &bb)
+	builder.bbs = append(builder.bbs, bb)
 	return builder
 }
 

source_builder.go

@@ -21,7 +21,7 @@ type SourceBuilder struct {
 	alia string
 	join *Join
 	sub  *BuilderX
-	bbs  []*Bb
+	bbs  []Bb
 }
 
 func (sb *SourceBuilder) Source(po Po) *SourceBuilder {

to_sql.go

@@ -24,9 +24,9 @@ import (
 
 type Built struct {
 	ResultKeys []string
-	ConditionX []*Bb
+	ConditionX []Bb
 	Sorts      []*Sort
-	Havings    []*Bb
+	Havings    []Bb
 	GroupBys   []string
 
 	Sbs []*SourceBuilder
@@ -98,7 +98,7 @@ func (built *Built) toSourceScriptOfCount(bpCount *strings.Builder) {
 	built.toSourceScript(bpCount)
 }
 
-func (built *Built) toConditionScriptOfCount(bbs []*Bb, bpCount *strings.Builder) {
+func (built *Built) toConditionScriptOfCount(bbs []Bb, bpCount *strings.Builder) {
 	built.toConditionScript(bbs, bpCount, nil, nil)
 }
 
@@ -116,7 +116,7 @@ func (built *Built) toSourceScript(bp *strings.Builder) {
 	}
 }
 
-func (built *Built) toBb(bb *Bb, bp *strings.Builder, vs *[]interface{}) {
+func (built *Built) toBb(bb Bb, bp *strings.Builder, vs *[]interface{}) {
 	op := bb.op
 	switch op {
 	case X:
@@ -164,7 +164,7 @@ func (built *Built) toBb(bb *Bb, bp *strings.Builder, vs *[]interface{}) {
 	}
 }
 
-func (built *Built) toConditionScript(bbs []*Bb, bp *strings.Builder, vs *[]interface{}, filterLast func() *Bb) {
+func (built *Built) toConditionScript(bbs []Bb, bp *strings.Builder, vs *[]interface{}, filterLast func() *Bb) {
 
 	length := len(bbs)
 	if length == 0 {
@@ -173,7 +173,7 @@ func (built *Built) toConditionScript(bbs []*Bb, bp *strings.Builder, vs *[]inte
 
 	if filterLast != nil {
 		if bb := filterLast(); bb != nil {
-			built.toBb(bb, bp, vs)
+			built.toBb(*bb, bp, vs)
 			if length > 0 {
 				bp.WriteString(AND_SCRIPT)
 			}
@@ -223,7 +223,7 @@ func (built *Built) toGroupBySql(bys []string, bp *strings.Builder) {
 	}
 }
 
-func (built *Built) toHavingSql(bys []*Bb, bp *strings.Builder) {
+func (built *Built) toHavingSql(bys []Bb, bp *strings.Builder) {
 	if bys == nil || len(bys) == 0 {
 		return
 	}
@@ -266,11 +266,11 @@ func (built *Built) toPageSql(condition *PageCondition, bp *strings.Builder) {
 	}
 }
 
-func (built *Built) isOr(bb *Bb) bool {
+func (built *Built) isOr(bb Bb) bool {
 	return bb.op == OR
 }
 
-func (built *Built) isOR(bb *Bb) bool {
+func (built *Built) isOR(bb Bb) bool {
 	return bb.op == OR && bb.key == ""
 }