Downgrade ugorji/codec

db/db.gen.go

@@ -1,5 +1,3 @@
-// +build go1.6
-
 // Code generated by codecgen - DO NOT EDIT.
 
 package db
@@ -13,42 +11,44 @@ import (
 
 const (
 	// ----- content types ----
-	codecSelferCcUTF84653 = 1
+	codecSelferCcUTF88369 = 1
-	codecSelferCcRAW4653  = 255
+	codecSelferCcRAW8369  = 255
 	// ----- value types used ----
-	codecSelferValueTypeArray4653     = 10
+	codecSelferValueTypeArray8369  = 10
-	codecSelferValueTypeMap4653       = 9
+	codecSelferValueTypeMap8369    = 9
-	codecSelferValueTypeString4653    = 6
+	codecSelferValueTypeString8369 = 6
-	codecSelferValueTypeInt4653       = 2
+	codecSelferValueTypeInt8369    = 2
-	codecSelferValueTypeUint4653      = 3
+	codecSelferValueTypeUint8369   = 3
-	codecSelferValueTypeFloat4653     = 4
+	codecSelferValueTypeFloat8369  = 4
-	codecSelferValueTypeNil4653       = 1
+	codecSelferBitsize8369         = uint8(32 << (^uint(0) >> 63))
-	codecSelferBitsize4653            = uint8(32 << (^uint(0) >> 63))
-	codecSelferDecContainerLenNil4653 = -2147483648
 )
 
 var (
-	errCodecSelferOnlyMapOrArrayEncodeToStruct4653 = errors.New(`only encoded map or array can be decoded into a struct`)
+	errCodecSelferOnlyMapOrArrayEncodeToStruct8369 = errors.New(`only encoded map or array can be decoded into a struct`)
 )
 
-type codecSelfer4653 struct{}
+type codecSelfer8369 struct{}
-
-func codecSelfer4653False() bool { return false }
 
 func init() {
-	if codec1978.GenVersion != 16 {
+	if codec1978.GenVersion != 10 {
 		_, file, _, _ := runtime.Caller(0)
-		ver := strconv.FormatInt(int64(codec1978.GenVersion), 10)
+		panic("codecgen version mismatch: current: 10, need " + strconv.FormatInt(int64(codec1978.GenVersion), 10) + ". Re-generate file: " + file)
-		panic("codecgen version mismatch: current: 16, need " + ver + ". Re-generate file: " + file)
+	}
+	if false {
+		var _ byte = 0 // reference the types, but skip this branch at build/run time
 	}
 }
 
 func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer4653
+	var h codecSelfer8369
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
+	} else {
+		if false {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
@@ -62,36 +62,7 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			_ = yyq2
 			if yyr2 || yy2arr2 {
-			z.EncWriteArrayStart(4)
+				r.WriteArrayStart(4)
-			z.EncWriteArrayElem()
-			if yyq2[0] {
-				r.EncodeString(string(x.Time))
-			} else {
-				r.EncodeString("")
-			}
-			z.EncWriteArrayElem()
-			if yyq2[1] {
-				r.EncodeString(string(x.Status))
-			} else {
-				r.EncodeString("")
-			}
-			z.EncWriteArrayElem()
-			if yyq2[2] {
-				r.EncodeString(string(x.Detail))
-			} else {
-				r.EncodeString("")
-			}
-			z.EncWriteArrayElem()
-			if yyq2[3] {
-				if x.Result == nil {
-					r.EncodeNil()
-				} else {
-					z.F.EncSliceIntfV(x.Result, e)
-				} // end block: if x.Result slice == nil
-			} else {
-				r.EncodeNil()
-			}
-			z.EncWriteArrayEnd()
 			} else {
 				var yynn2 int
 				for _, b := range yyq2 {
@@ -99,84 +70,157 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 						yynn2++
 					}
 				}
-			z.EncWriteMapStart(yynn2)
+				r.WriteMapStart(yynn2)
 				yynn2 = 0
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayElem()
 				if yyq2[0] {
-				z.EncWriteMapElemKey()
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Time))
+					}
+				} else {
+					r.EncodeStringEnc(codecSelferCcUTF88369, "")
+				}
+			} else {
+				if yyq2[0] {
+					r.WriteMapElemKey()
 					if z.IsJSONHandle() {
 						z.WriteStr("\"time\"")
 					} else {
-					r.EncodeString(`time`)
+						r.EncodeStringEnc(codecSelferCcUTF88369, `time`)
 					}
-				z.EncWriteMapElemValue()
+					r.WriteMapElemValue()
-				r.EncodeString(string(x.Time))
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Time))
 					}
+				}
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayElem()
 				if yyq2[1] {
-				z.EncWriteMapElemKey()
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Status))
+					}
+				} else {
+					r.EncodeStringEnc(codecSelferCcUTF88369, "")
+				}
+			} else {
+				if yyq2[1] {
+					r.WriteMapElemKey()
 					if z.IsJSONHandle() {
 						z.WriteStr("\"status\"")
 					} else {
-					r.EncodeString(`status`)
+						r.EncodeStringEnc(codecSelferCcUTF88369, `status`)
 					}
-				z.EncWriteMapElemValue()
+					r.WriteMapElemValue()
-				r.EncodeString(string(x.Status))
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Status))
 					}
+				}
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayElem()
 				if yyq2[2] {
-				z.EncWriteMapElemKey()
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Detail))
+					}
+				} else {
+					r.EncodeStringEnc(codecSelferCcUTF88369, "")
+				}
+			} else {
+				if yyq2[2] {
+					r.WriteMapElemKey()
 					if z.IsJSONHandle() {
 						z.WriteStr("\"detail\"")
 					} else {
-					r.EncodeString(`detail`)
+						r.EncodeStringEnc(codecSelferCcUTF88369, `detail`)
 					}
-				z.EncWriteMapElemValue()
+					r.WriteMapElemValue()
-				r.EncodeString(string(x.Detail))
+					if false {
-			}
-			if yyq2[3] {
-				z.EncWriteMapElemKey()
-				if z.IsJSONHandle() {
-					z.WriteStr("\"result\"")
 					} else {
-					r.EncodeString(`result`)
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Detail))
 					}
-				z.EncWriteMapElemValue()
+				}
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayElem()
+				if yyq2[3] {
 					if x.Result == nil {
 						r.EncodeNil()
+					} else {
+						if false {
 						} else {
 							z.F.EncSliceIntfV(x.Result, e)
-				} // end block: if x.Result slice == nil
 						}
-			z.EncWriteMapEnd()
+					}
+				} else {
+					r.EncodeNil()
+				}
+			} else {
+				if yyq2[3] {
+					r.WriteMapElemKey()
+					if z.IsJSONHandle() {
+						z.WriteStr("\"result\"")
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, `result`)
+					}
+					r.WriteMapElemValue()
+					if x.Result == nil {
+						r.EncodeNil()
+					} else {
+						if false {
+						} else {
+							z.F.EncSliceIntfV(x.Result, e)
+						}
+					}
+				}
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayEnd()
+			} else {
+				r.WriteMapEnd()
+			}
 		}
 	}
 }
 
 func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer4653
+	var h codecSelfer8369
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
+	if false {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
+	} else {
 		yyct2 := r.ContainerType()
-	if yyct2 == codecSelferValueTypeNil4653 {
+		if yyct2 == codecSelferValueTypeMap8369 {
-		*(x) = Response{}
+			yyl2 := r.ReadMapStart()
-	} else if yyct2 == codecSelferValueTypeMap4653 {
-		yyl2 := z.DecReadMapStart()
 			if yyl2 == 0 {
+				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		z.DecReadMapEnd()
+		} else if yyct2 == codecSelferValueTypeArray8369 {
-	} else if yyct2 == codecSelferValueTypeArray4653 {
+			yyl2 := r.ReadArrayStart()
-		yyl2 := z.DecReadArrayStart()
+			if yyl2 == 0 {
-		if yyl2 != 0 {
+				r.ReadArrayEnd()
+			} else {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
-		z.DecReadArrayEnd()
 		} else {
-		panic(errCodecSelferOnlyMapOrArrayEncodeToStruct4653)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct8369)
+		}
 	}
 }
 
 func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer4653
+	var h codecSelfer8369
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -186,30 +230,50 @@ func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 				break
 			}
 		} else {
-			if z.DecCheckBreak() {
+			if r.CheckBreak() {
 				break
 			}
 		}
-		z.DecReadMapElemKey()
+		r.ReadMapElemKey()
 		yys3 := z.StringView(r.DecodeStringAsBytes())
-		z.DecReadMapElemValue()
+		r.ReadMapElemValue()
 		switch yys3 {
 		case "time":
-			x.Time = (string)(string(r.DecodeStringAsBytes()))
+			if r.TryDecodeAsNil() {
+				x.Time = ""
+			} else {
+				x.Time = (string)(r.DecodeString())
+			}
 		case "status":
-			x.Status = (string)(string(r.DecodeStringAsBytes()))
+			if r.TryDecodeAsNil() {
+				x.Status = ""
+			} else {
+				x.Status = (string)(r.DecodeString())
+			}
 		case "detail":
-			x.Detail = (string)(string(r.DecodeStringAsBytes()))
+			if r.TryDecodeAsNil() {
+				x.Detail = ""
+			} else {
+				x.Detail = (string)(r.DecodeString())
+			}
 		case "result":
+			if r.TryDecodeAsNil() {
+				x.Result = nil
+			} else {
+				if false {
+				} else {
 					z.F.DecSliceIntfX(&x.Result, d)
+				}
+			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
 	} // end for yyj3
+	r.ReadMapEnd()
 }
 
 func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer4653
+	var h codecSelfer8369
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj9 int
@@ -219,71 +283,95 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if yyhl9 {
 		yyb9 = yyj9 > l
 	} else {
-		yyb9 = z.DecCheckBreak()
+		yyb9 = r.CheckBreak()
 	}
 	if yyb9 {
-		z.DecReadArrayEnd()
+		r.ReadArrayEnd()
 		return
 	}
-	z.DecReadArrayElem()
+	r.ReadArrayElem()
-	x.Time = (string)(string(r.DecodeStringAsBytes()))
+	if r.TryDecodeAsNil() {
+		x.Time = ""
+	} else {
+		x.Time = (string)(r.DecodeString())
+	}
 	yyj9++
 	if yyhl9 {
 		yyb9 = yyj9 > l
 	} else {
-		yyb9 = z.DecCheckBreak()
+		yyb9 = r.CheckBreak()
 	}
 	if yyb9 {
-		z.DecReadArrayEnd()
+		r.ReadArrayEnd()
 		return
 	}
-	z.DecReadArrayElem()
+	r.ReadArrayElem()
-	x.Status = (string)(string(r.DecodeStringAsBytes()))
+	if r.TryDecodeAsNil() {
+		x.Status = ""
+	} else {
+		x.Status = (string)(r.DecodeString())
+	}
 	yyj9++
 	if yyhl9 {
 		yyb9 = yyj9 > l
 	} else {
-		yyb9 = z.DecCheckBreak()
+		yyb9 = r.CheckBreak()
 	}
 	if yyb9 {
-		z.DecReadArrayEnd()
+		r.ReadArrayEnd()
 		return
 	}
-	z.DecReadArrayElem()
+	r.ReadArrayElem()
-	x.Detail = (string)(string(r.DecodeStringAsBytes()))
+	if r.TryDecodeAsNil() {
+		x.Detail = ""
+	} else {
+		x.Detail = (string)(r.DecodeString())
+	}
 	yyj9++
 	if yyhl9 {
 		yyb9 = yyj9 > l
 	} else {
-		yyb9 = z.DecCheckBreak()
+		yyb9 = r.CheckBreak()
 	}
 	if yyb9 {
-		z.DecReadArrayEnd()
+		r.ReadArrayEnd()
 		return
 	}
-	z.DecReadArrayElem()
+	r.ReadArrayElem()
+	if r.TryDecodeAsNil() {
+		x.Result = nil
+	} else {
+		if false {
+		} else {
 			z.F.DecSliceIntfX(&x.Result, d)
+		}
+	}
 	for {
 		yyj9++
 		if yyhl9 {
 			yyb9 = yyj9 > l
 		} else {
-			yyb9 = z.DecCheckBreak()
+			yyb9 = r.CheckBreak()
 		}
 		if yyb9 {
 			break
 		}
-		z.DecReadArrayElem()
+		r.ReadArrayElem()
 		z.DecStructFieldNotFound(yyj9-1, "")
 	}
+	r.ReadArrayEnd()
 }
 
 func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer4653
+	var h codecSelfer8369
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
+	} else {
+		if false {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
@@ -296,26 +384,7 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			_ = yyq2
 			if yyr2 || yy2arr2 {
-			z.EncWriteArrayStart(3)
+				r.WriteArrayStart(3)
-			z.EncWriteArrayElem()
-			if yyq2[0] {
-				r.EncodeString(string(x.Query))
-			} else {
-				r.EncodeString("")
-			}
-			z.EncWriteArrayElem()
-			if yyq2[1] {
-				r.EncodeString(string(x.Action))
-			} else {
-				r.EncodeString("")
-			}
-			z.EncWriteArrayElem()
-			if yyq2[2] {
-				z.EncFallback(x.Result)
-			} else {
-				r.EncodeNil()
-			}
-			z.EncWriteArrayEnd()
 			} else {
 				var yynn2 int
 				for _, b := range yyq2 {
@@ -323,70 +392,132 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
 						yynn2++
 					}
 				}
-			z.EncWriteMapStart(yynn2)
+				r.WriteMapStart(yynn2)
 				yynn2 = 0
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayElem()
 				if yyq2[0] {
-				z.EncWriteMapElemKey()
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Query))
+					}
+				} else {
+					r.EncodeStringEnc(codecSelferCcUTF88369, "")
+				}
+			} else {
+				if yyq2[0] {
+					r.WriteMapElemKey()
 					if z.IsJSONHandle() {
 						z.WriteStr("\"query\"")
 					} else {
-					r.EncodeString(`query`)
+						r.EncodeStringEnc(codecSelferCcUTF88369, `query`)
 					}
-				z.EncWriteMapElemValue()
+					r.WriteMapElemValue()
-				r.EncodeString(string(x.Query))
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Query))
 					}
+				}
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayElem()
 				if yyq2[1] {
-				z.EncWriteMapElemKey()
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Action))
+					}
+				} else {
+					r.EncodeStringEnc(codecSelferCcUTF88369, "")
+				}
+			} else {
+				if yyq2[1] {
+					r.WriteMapElemKey()
 					if z.IsJSONHandle() {
 						z.WriteStr("\"action\"")
 					} else {
-					r.EncodeString(`action`)
+						r.EncodeStringEnc(codecSelferCcUTF88369, `action`)
 					}
-				z.EncWriteMapElemValue()
+					r.WriteMapElemValue()
-				r.EncodeString(string(x.Action))
+					if false {
+					} else {
+						r.EncodeStringEnc(codecSelferCcUTF88369, string(x.Action))
 					}
+				}
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayElem()
 				if yyq2[2] {
-				z.EncWriteMapElemKey()
+					if x.Result == nil {
+						r.EncodeNil()
+					} else {
+						if false {
+						} else {
+							z.EncFallback(x.Result)
+						}
+					}
+				} else {
+					r.EncodeNil()
+				}
+			} else {
+				if yyq2[2] {
+					r.WriteMapElemKey()
 					if z.IsJSONHandle() {
 						z.WriteStr("\"result\"")
 					} else {
-					r.EncodeString(`result`)
+						r.EncodeStringEnc(codecSelferCcUTF88369, `result`)
 					}
-				z.EncWriteMapElemValue()
+					r.WriteMapElemValue()
+					if x.Result == nil {
+						r.EncodeNil()
+					} else {
+						if false {
+						} else {
 							z.EncFallback(x.Result)
 						}
-			z.EncWriteMapEnd()
+					}
+				}
+			}
+			if yyr2 || yy2arr2 {
+				r.WriteArrayEnd()
+			} else {
+				r.WriteMapEnd()
+			}
 		}
 	}
 }
 
 func (x *Dispatch) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer4653
+	var h codecSelfer8369
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
+	if false {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
+	} else {
 		yyct2 := r.ContainerType()
-	if yyct2 == codecSelferValueTypeNil4653 {
+		if yyct2 == codecSelferValueTypeMap8369 {
-		*(x) = Dispatch{}
+			yyl2 := r.ReadMapStart()
-	} else if yyct2 == codecSelferValueTypeMap4653 {
-		yyl2 := z.DecReadMapStart()
 			if yyl2 == 0 {
+				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		z.DecReadMapEnd()
+		} else if yyct2 == codecSelferValueTypeArray8369 {
-	} else if yyct2 == codecSelferValueTypeArray4653 {
+			yyl2 := r.ReadArrayStart()
-		yyl2 := z.DecReadArrayStart()
+			if yyl2 == 0 {
-		if yyl2 != 0 {
+				r.ReadArrayEnd()
+			} else {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
-		z.DecReadArrayEnd()
 		} else {
-		panic(errCodecSelferOnlyMapOrArrayEncodeToStruct4653)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct8369)
+		}
 	}
 }
 
 func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer4653
+	var h codecSelfer8369
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -396,28 +527,44 @@ func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 				break
 			}
 		} else {
-			if z.DecCheckBreak() {
+			if r.CheckBreak() {
 				break
 			}
 		}
-		z.DecReadMapElemKey()
+		r.ReadMapElemKey()
 		yys3 := z.StringView(r.DecodeStringAsBytes())
-		z.DecReadMapElemValue()
+		r.ReadMapElemValue()
 		switch yys3 {
 		case "query":
-			x.Query = (string)(string(r.DecodeStringAsBytes()))
+			if r.TryDecodeAsNil() {
+				x.Query = ""
+			} else {
+				x.Query = (string)(r.DecodeString())
+			}
 		case "action":
-			x.Action = (string)(string(r.DecodeStringAsBytes()))
+			if r.TryDecodeAsNil() {
+				x.Action = ""
+			} else {
+				x.Action = (string)(r.DecodeString())
+			}
 		case "result":
+			if r.TryDecodeAsNil() {
+				x.Result = nil
+			} else {
+				if false {
+				} else {
 					z.DecFallback(&x.Result, true)
+				}
+			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
 	} // end for yyj3
+	r.ReadMapEnd()
 }
 
 func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer4653
+	var h codecSelfer8369
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj8 int
@@ -427,49 +574,65 @@ func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if yyhl8 {
 		yyb8 = yyj8 > l
 	} else {
-		yyb8 = z.DecCheckBreak()
+		yyb8 = r.CheckBreak()
 	}
 	if yyb8 {
-		z.DecReadArrayEnd()
+		r.ReadArrayEnd()
 		return
 	}
-	z.DecReadArrayElem()
+	r.ReadArrayElem()
-	x.Query = (string)(string(r.DecodeStringAsBytes()))
+	if r.TryDecodeAsNil() {
+		x.Query = ""
+	} else {
+		x.Query = (string)(r.DecodeString())
+	}
 	yyj8++
 	if yyhl8 {
 		yyb8 = yyj8 > l
 	} else {
-		yyb8 = z.DecCheckBreak()
+		yyb8 = r.CheckBreak()
 	}
 	if yyb8 {
-		z.DecReadArrayEnd()
+		r.ReadArrayEnd()
 		return
 	}
-	z.DecReadArrayElem()
+	r.ReadArrayElem()
-	x.Action = (string)(string(r.DecodeStringAsBytes()))
+	if r.TryDecodeAsNil() {
+		x.Action = ""
+	} else {
+		x.Action = (string)(r.DecodeString())
+	}
 	yyj8++
 	if yyhl8 {
 		yyb8 = yyj8 > l
 	} else {
-		yyb8 = z.DecCheckBreak()
+		yyb8 = r.CheckBreak()
 	}
 	if yyb8 {
-		z.DecReadArrayEnd()
+		r.ReadArrayEnd()
 		return
 	}
-	z.DecReadArrayElem()
+	r.ReadArrayElem()
+	if r.TryDecodeAsNil() {
+		x.Result = nil
+	} else {
+		if false {
+		} else {
 			z.DecFallback(&x.Result, true)
+		}
+	}
 	for {
 		yyj8++
 		if yyhl8 {
 			yyb8 = yyj8 > l
 		} else {
-			yyb8 = z.DecCheckBreak()
+			yyb8 = r.CheckBreak()
 		}
 		if yyb8 {
 			break
 		}
-		z.DecReadArrayElem()
+		r.ReadArrayElem()
 		z.DecStructFieldNotFound(yyj8-1, "")
 	}
+	r.ReadArrayEnd()
 }

db/gen.go

@@ -14,5 +14,5 @@
 
 package db
 
-//go:generate go get -u github.com/ugorji/go/codec/codecgen
+//go:generate go get -u github.com/ugorji/go/codec/codecgen@v0.0.0-20181204163529-d75b2dcb6bc8
 //go:generate codecgen -o db.gen.go db.go

go.mod

@@ -5,14 +5,14 @@ go 1.13
 require (
 	github.com/abcum/bump v0.0.0-20190929092354-46a9c9dbf9ab
 	github.com/abcum/cork v0.0.0-20190929093632-f45e788b8f1b
-	github.com/abcum/fibre v0.0.0-20191120130824-2807c02ac0d6
+	github.com/abcum/fibre v0.0.0-20191120141235-91225f7e723a
-	github.com/abcum/rixxdb v0.0.0-20191008002349-42eb662df538
+	github.com/abcum/rixxdb v0.0.0-20191031151827-f515482b89eb
+	github.com/abcum/tmpl v0.0.0-20190929092451-4b08f6027ed1 // indirect
 	github.com/dgraph-io/ristretto v0.0.0-20191114170855-99d1bbbf28e6
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/elithrar/simple-scrypt v1.3.0
 	github.com/gorilla/websocket v1.4.1
-	github.com/hjson/hjson-go v3.0.0+incompatible
+	github.com/hjson/hjson-go v3.0.1+incompatible
-	github.com/kr/pretty v0.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/pkg/profile v1.3.0
@@ -21,12 +21,12 @@ require (
 	github.com/satori/go.uuid v1.2.0
 	github.com/sergi/go-diff v1.0.0
 	github.com/sirupsen/logrus v1.4.2
-	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/spf13/cobra v0.0.5
 	github.com/stackimpact/stackimpact-go v2.3.10+incompatible
-	github.com/ugorji/go/codec v1.1.7
+	github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8
-	golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc
+	golang.org/x/crypto v0.0.0-20191119213627-4f8c1d86b1ba
-	golang.org/x/net v0.0.0-20191002035440-2ec189313ef0
+	golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914
 	golang.org/x/text v0.3.2
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	golang.org/x/tools v0.0.0-20191120001058-ad01d5993d97 // indirect
 )

go.sum

@@ -5,10 +5,12 @@ github.com/abcum/bump v0.0.0-20190929092354-46a9c9dbf9ab h1:S7Bp0inII96zGek8nipo
 github.com/abcum/bump v0.0.0-20190929092354-46a9c9dbf9ab/go.mod h1:nhz3F2Uy1ra958EB0V4uR1WjTdLmpiznz7sqMdRBi7A=
 github.com/abcum/cork v0.0.0-20190929093632-f45e788b8f1b h1:R/fzwNDZALJjuU9zjtJ8z1YTp03xkePY7ITjfaTppbA=
 github.com/abcum/cork v0.0.0-20190929093632-f45e788b8f1b/go.mod h1:t54olPax+YxSe0VIdutFPcEupQhkg7Y3QA8FzxNe6Po=
-github.com/abcum/fibre v0.0.0-20191120130824-2807c02ac0d6 h1:+gLEFhAtsOR8qveBk6GtPE57ymj8Fe9W1g5dSpJVRh4=
+github.com/abcum/fibre v0.0.0-20191120141235-91225f7e723a h1:nD0QoQQ03SUnDae0bqyNYj/IN0D6vovAjtwIr07U1PQ=
-github.com/abcum/fibre v0.0.0-20191120130824-2807c02ac0d6/go.mod h1:jzcc78oww2LSmc2uFetv8rQ2XI7c6JtbFrOtS1mVdHQ=
+github.com/abcum/fibre v0.0.0-20191120141235-91225f7e723a/go.mod h1:+eFxgfBo6LCF13y5Eq3+ElYlHebIGIf4bBaqP2z83yo=
-github.com/abcum/rixxdb v0.0.0-20191008002349-42eb662df538 h1:y1Qj5WC/jAYWRQt/z00RCUB7XgFm7K5ej7S6lqE9whA=
+github.com/abcum/rixxdb v0.0.0-20191031151827-f515482b89eb h1:XsphbsOLSH4V01atOtRwMxRePRCvT5yuZtdMcKkE+2k=
-github.com/abcum/rixxdb v0.0.0-20191008002349-42eb662df538/go.mod h1:6lIALuvT453ADA/5AFRXGLDNcc3sqIvt4ISaKyPeTLg=
+github.com/abcum/rixxdb v0.0.0-20191031151827-f515482b89eb/go.mod h1:6lIALuvT453ADA/5AFRXGLDNcc3sqIvt4ISaKyPeTLg=
+github.com/abcum/tmpl v0.0.0-20190929092451-4b08f6027ed1 h1:hRp2bOK7p4HTCCFl4v0apR309NuN1qpKnWnX21JSCHQ=
+github.com/abcum/tmpl v0.0.0-20190929092451-4b08f6027ed1/go.mod h1:T/xXRVJ6YMMHqf+MiKW6KELsEmb2n4eNMsaNQ6lI5M8=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -32,19 +34,14 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hjson/hjson-go v3.0.0+incompatible h1:mc8olpIxqF8mrEx6ePJOD6wCCOkX7+JcrKgINcJES10=
+github.com/hjson/hjson-go v3.0.1+incompatible h1:JwOXblcMiBbiWue7iPkoFK9oXSnW8n+qXh/0Fio6TCo=
-github.com/hjson/hjson-go v3.0.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
+github.com/hjson/hjson-go v3.0.1+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -79,8 +76,9 @@ github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8=
 github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -96,20 +94,24 @@ github.com/stackimpact/stackimpact-go v2.3.10+incompatible/go.mod h1:Seecan0KCHJ
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/ugorji/go v0.0.0-20181204163529-d75b2dcb6bc8 h1:Kcv6ck5PWsaDifMwDDgexKfbmP1k63r3tcVppPa+FyM=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc h1:c0o/qxkaO2LF5t6fQrT4b5hzyggAkLLlCUjqfRxd8Q4=
+golang.org/x/crypto v0.0.0-20191119213627-4f8c1d86b1ba h1:9bFeDpN3gTqNanMVqNcoR/pJQuP5uroC3t1D7eXozTE=
-golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191119213627-4f8c1d86b1ba/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914 h1:MlY3mEfbnWGmUi4rtHOtNnnnN4UJRGSyLPx+DXA5Sq4=
+golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -120,8 +122,11 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20191120001058-ad01d5993d97 h1:u8hSFDulpuhoY0GHMbG6Rp23PzphtTnZrQX3dOvEae0=
+golang.org/x/tools v0.0.0-20191120001058-ad01d5993d97/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

kvs/rixxdb/main.go

@@ -36,8 +36,6 @@ func init() {
 			FlushPolicy: opts.DB.Proc.Flush,
 			// Set the shrink offset duration
 			ShrinkPolicy: opts.DB.Proc.Shrink,
-			// Don't wait for syncing if shrinking
-			IgnorePolicyWhenShrinking: true,
 		})
 
 		if err != nil {

sql/gen.go

@@ -18,5 +18,5 @@ package sql
 //go:generate tmpl -file=kill.gen.json kill.gen.go.tmpl
 //go:generate tmpl -file=rdwr.gen.json rdwr.gen.go.tmpl
 
-//go:generate go get -u github.com/ugorji/go/codec/codecgen
+//go:generate go get -u github.com/ugorji/go/codec/codecgen@v0.0.0-20181204163529-d75b2dcb6bc8
 //go:generate codecgen -o ast.gen.go ast.go