ajust code for table

plugin/dapp/exchange/executor/README.md

@@ -11,7 +11,7 @@
 查询方法名称|功能
 -----|----
 QueryMarketDepth|获取指定交易资产的市场深度
-QueryCompletedOrderList|实时获取指定交易对最新的成交信息
+QueryHistoryOrderList|实时获取指定交易对已经成交的订单信息
 QueryOrder|根据orderID订单号查询具体的订单信息
 QueryOrderList|根据用户地址和订单状态（ordered,completed,revoked)，实时地获取相应相应的订单详情
 

plugin/dapp/exchange/executor/exchange_test.go

@@ -240,8 +240,8 @@ func TestExchange(t *testing.T) {
 	//市场深度应该改变
 	assert.Equal(t, 5*types.Coin, reply1.List[0].GetAmount())
 
-	//QueryCompletedOrderList
-	msg, err = exec.Query(et.FuncNameQueryCompletedOrderList, types.Encode(&et.QueryCompletedOrderList{LeftAsset: &et.Asset{Symbol: "bty", Execer: "coins"},
+	//QueryHistoryOrderList
+	msg, err = exec.Query(et.FuncNameQueryHistoryOrderList, types.Encode(&et.QueryHistoryOrderList{LeftAsset: &et.Asset{Symbol: "bty", Execer: "coins"},
 		RightAsset: &et.Asset{Execer: "token", Symbol: "CCNY"}}))
 	if err != nil {
 		t.Error(err)
@@ -831,14 +831,12 @@ func TestCheckPrice(t *testing.T) {
 }
 
 func TestRawMeta(t *testing.T) {
-	CompletedOrderRow := NewCompletedOrderRow()
-	t.Log(CompletedOrderRow.Get("index"))
+	HistoryOrderRow := NewHistoryOrderRow()
+	t.Log(HistoryOrderRow.Get("index"))
 	MarketDepthRow := NewMarketDepthRow()
 	t.Log(MarketDepthRow.Get("price"))
 	marketOrderRow := NewOrderRow()
 	t.Log(marketOrderRow.Get("orderID"))
-	UserOrderRow := NewUserOrderRow()
-	t.Log(UserOrderRow.Get("index"))
 }
 
 func TestKV(t *testing.T) {

plugin/dapp/exchange/executor/exchangedb.go

@@ -585,19 +585,20 @@ func QueryMarketDepth(localdb dbm.KV, left, right *et.Asset, op int32, primaryKe
 	return &list, nil
 }
 
-//QueryCompletedOrderList
-func QueryCompletedOrderList(localdb dbm.KV, left, right *et.Asset, primaryKey string, count, direction int32) (types.Message, error) {
-	table := NewCompletedOrderTable(localdb)
+//QueryHistoryOrderList
+func QueryHistoryOrderList(localdb dbm.KV, left, right *et.Asset, primaryKey string, count, direction int32) (types.Message, error) {
+	table := NewHistoryOrderTable(localdb)
 	prefix := []byte(fmt.Sprintf("%s:%s", left.Symbol, right.Symbol))
+	indexName := "name"
 	if count == 0 {
 		count = et.Count
 	}
 	var rows []*tab.Row
 	var err error
 	if primaryKey == "" { //第一次查询,默认展示最新得成交记录
-		rows, err = table.ListIndex("index", prefix, nil, count, direction)
+		rows, err = table.ListIndex(indexName, prefix, nil, count, direction)
 	} else {
-		rows, err = table.ListIndex("index", prefix, []byte(primaryKey), count, direction)
+		rows, err = table.ListIndex(indexName, prefix, []byte(primaryKey), count, direction)
 	}
 	if err != nil {
 		elog.Error("QueryCompletedOrderList.", "left", left, "right", right, "err", err.Error())
@@ -607,6 +608,10 @@ func QueryCompletedOrderList(localdb dbm.KV, left, right *et.Asset, primaryKey s
 	var orderList et.OrderList
 	for _, row := range rows {
 		order := row.Data.(*et.Order)
+		//因为这张表里面记录了 completed,revoked 两种状态的订单，所以需要过滤
+		if order.Status == et.Revoked {
+			continue
+		}
 		//替换已经成交得量
 		order.Executed = order.GetLimitOrder().Amount - order.Balance
 		orderList.List = append(orderList.List, order)
@@ -620,17 +625,23 @@ func QueryCompletedOrderList(localdb dbm.KV, left, right *et.Asset, primaryKey s
 
 //QueryOrderList,默认展示最新的
 func QueryOrderList(localdb dbm.KV, statedb dbm.KV, addr string, status, count, direction int32, primaryKey string) (types.Message, error) {
-	table := NewUserOrderTable(localdb)
+	var table *tab.Table
+	if status == et.Completed || status == et.Revoked {
+		table = NewHistoryOrderTable(localdb)
+	} else {
+		table = NewMarketOrderTable(localdb)
+	}
 	prefix := []byte(fmt.Sprintf("%s:%d", addr, status))
+	indexName := "addr_status"
 	if count == 0 {
 		count = et.Count
 	}
 	var rows []*tab.Row
 	var err error
 	if primaryKey == "" { //第一次查询,默认展示最新得成交记录
-		rows, err = table.ListIndex("index", prefix, nil, count, direction)
+		rows, err = table.ListIndex(indexName, prefix, nil, count, direction)
 	} else {
-		rows, err = table.ListIndex("index", prefix, []byte(primaryKey), count, direction)
+		rows, err = table.ListIndex(indexName, prefix, []byte(primaryKey), count, direction)
 	}
 	if err != nil {
 		elog.Error("QueryOrderList.", "addr", addr, "err", err.Error())

plugin/dapp/exchange/executor/exec_local.go

@@ -66,16 +66,14 @@ func (e *exchange) ExecLocal_RevokeOrder(payload *ety.RevokeOrder, tx *types.Tra
 
 //设置自动回滚
 func (e *exchange) addAutoRollBack(tx *types.Transaction, kv []*types.KeyValue) *types.LocalDBSet {
-
 	dbSet := &types.LocalDBSet{}
 	dbSet.KV = e.AddRollbackKV(tx, tx.Execer, kv)
 	return dbSet
 }
 
 func (e *exchange) updateIndex(receipt *ety.ReceiptExchange) (kvs []*types.KeyValue) {
-	completedTable := NewCompletedOrderTable(e.GetLocalDB())
+	historyTable := NewHistoryOrderTable(e.GetLocalDB())
 	marketTable := NewMarketDepthTable(e.GetLocalDB())
-	userTable := NewUserOrderTable(e.GetLocalDB())
 	orderTable := NewMarketOrderTable(e.GetLocalDB())
 	switch receipt.Order.Status {
 	case ety.Ordered:
@@ -111,30 +109,26 @@ func (e *exchange) updateIndex(receipt *ety.ReceiptExchange) (kvs []*types.KeyVa
 			elog.Error("updateIndex", "orderTable.Replace", err.Error())
 			return nil
 		}
-		err = userTable.Replace(order)
-		if err != nil {
-			return nil
-		}
 		if len(receipt.MatchOrders) > 0 {
 			//撮合交易更新
 			cache := make(map[float64]int64)
 			for i, matchOrder := range receipt.MatchOrders {
 				if matchOrder.Status == ety.Completed {
 					// 删除原有状态orderID
+					matchOrder.Status = ety.Ordered
 					err = orderTable.DelRow(matchOrder)
 					if err != nil {
 						elog.Error("updateIndex", "orderTable.DelRow", err.Error())
 						return nil
 					}
-					//删除原有状态orderID
-					matchOrder.Status = ety.Ordered
-					userTable.DelRow(matchOrder)
-					//更新状态为已完成,索引index,改为当前的index
+					//索引index,改为当前的index
 					matchOrder.Status = ety.Completed
 					matchOrder.Index = index + int64(i+1)
-					userTable.Replace(matchOrder)
-					//calcCompletedOrderKey
-					completedTable.Replace(matchOrder)
+					err = historyTable.Replace(matchOrder)
+					if err != nil {
+						elog.Error("updateIndex", "historyTable.Replace", err.Error())
+						return nil
+					}
 				}
 				if matchOrder.Status == ety.Ordered {
 					//更新数据
@@ -183,14 +177,9 @@ func (e *exchange) updateIndex(receipt *ety.ReceiptExchange) (kvs []*types.KeyVa
 		right := receipt.GetOrder().GetLimitOrder().GetRightAsset()
 		op := receipt.GetOrder().GetLimitOrder().GetOp()
 		index := receipt.GetIndex()
-		err := userTable.Replace(receipt.GetOrder())
-		if err != nil {
-			elog.Error("updateIndex", "userTable.Replace", err.Error())
-			return nil
-		}
-		err = completedTable.Replace(receipt.Order)
+		err := historyTable.Replace(receipt.GetOrder())
 		if err != nil {
-			elog.Error("updateIndex", "completedTable.Replace", err.Error())
+			elog.Error("updateIndex", "historyTable.Replace", err.Error())
 			return nil
 		}
 		cache := make(map[float64]int64)
@@ -199,30 +188,18 @@ func (e *exchange) updateIndex(receipt *ety.ReceiptExchange) (kvs []*types.KeyVa
 			for i, matchOrder := range receipt.MatchOrders {
 				if matchOrder.Status == ety.Completed {
 					// 删除原有状态orderID
+					matchOrder.Status = ety.Ordered
 					err = orderTable.DelRow(matchOrder)
 					if err != nil {
 						elog.Error("updateIndex", "orderTable.DelRow", err.Error())
 						return nil
 					}
-					//删除原有状态orderID
-					matchOrder.Status = ety.Ordered
-					err = userTable.DelRow(matchOrder)
-					if err != nil {
-						elog.Error("updateIndex", "userTable.DelRow", err.Error())
-						return nil
-					}
-					//更新状态为已完成,更新索引
+					//索引index,改为当前的index
 					matchOrder.Status = ety.Completed
 					matchOrder.Index = index + int64(i+1)
-					err = userTable.Replace(matchOrder)
-					if err != nil {
-						elog.Error("updateIndex", "userTable.Replace", err.Error())
-						return nil
-					}
-					//calcCompletedOrderKey
-					err = completedTable.Replace(matchOrder)
+					err = historyTable.Replace(matchOrder)
 					if err != nil {
-						elog.Error("updateIndex", "completedTable.Replace", err.Error())
+						elog.Error("updateIndex", "historyTable.Replace", err.Error())
 						return nil
 					}
 				}
@@ -299,25 +276,19 @@ func (e *exchange) updateIndex(receipt *ety.ReceiptExchange) (kvs []*types.KeyVa
 				return nil
 			}
 		}
-		// 删除原有状态orderID
-		err = orderTable.DelRow(order)
-		if err != nil {
-			elog.Error("updateIndex", "orderTable.DelRow", err.Error())
-			return nil
-		}
 		//删除原有状态orderID
 		order.Status = ety.Ordered
-		err = userTable.DelRow(order)
+		err = orderTable.DelRow(order)
 		if err != nil {
-			elog.Error("updateIndex", "userTable.DelRow", err.Error())
+			elog.Error("updateIndex", "orderTable.DelRow", err.Error())
 			return nil
 		}
 		order.Status = ety.Revoked
 		order.Index = index
 		//添加撤销的订单
-		err = userTable.Replace(order)
+		err = historyTable.Replace(order)
 		if err != nil {
-			elog.Error("updateIndex", "userTable.Replace", err.Error())
+			elog.Error("updateIndex", "historyTable.Replace", err.Error())
 			return nil
 		}
 	}
@@ -328,21 +299,15 @@ func (e *exchange) updateIndex(receipt *ety.ReceiptExchange) (kvs []*types.KeyVa
 		return nil
 	}
 	kvs = append(kvs, kv...)
-	kv, err = userTable.Save()
-	if err != nil {
-		elog.Error("updateIndex", "userTable.Save", err.Error())
-		return nil
-	}
-	kvs = append(kvs, kv...)
 	kv, err = orderTable.Save()
 	if err != nil {
 		elog.Error("updateIndex", "orderTable.Save", err.Error())
 		return nil
 	}
 	kvs = append(kvs, kv...)
-	kv, err = completedTable.Save()
+	kv, err = historyTable.Save()
 	if err != nil {
-		elog.Error("updateIndex", "completedTable.Save", err.Error())
+		elog.Error("updateIndex", "historyTable.Save", err.Error())
 		return nil
 	}
 	kvs = append(kvs, kv...)

plugin/dapp/exchange/executor/query.go

@@ -24,7 +24,7 @@ func (s *exchange) Query_QueryMarketDepth(in *et.QueryMarketDepth) (types.Messag
 }
 
 //查询已经完成得订单
-func (s *exchange) Query_QueryCompletedOrderList(in *et.QueryCompletedOrderList) (types.Message, error) {
+func (s *exchange) Query_QueryHistoryOrderList(in *et.QueryHistoryOrderList) (types.Message, error) {
 	if !CheckExchangeAsset(in.LeftAsset, in.RightAsset) {
 		return nil, et.ErrAsset
 	}
@@ -35,7 +35,7 @@ func (s *exchange) Query_QueryCompletedOrderList(in *et.QueryCompletedOrderList)
 	if !CheckDirection(in.Direction) {
 		return nil, et.ErrDirection
 	}
-	return QueryCompletedOrderList(s.GetLocalDB(), in.LeftAsset, in.RightAsset, in.PrimaryKey, in.Count, in.Direction)
+	return QueryHistoryOrderList(s.GetLocalDB(), in.LeftAsset, in.RightAsset, in.PrimaryKey, in.Count, in.Direction)
 }
 
 //根据orderID查询订单信息

plugin/dapp/exchange/executor/tables.go

@@ -40,22 +40,14 @@ var opt_exchange_order = &table.Option{
 	Prefix:  KeyPrefixLocalDB,
 	Name:    "order",
 	Primary: "orderID",
-	Index:   []string{"market_order"},
+	Index:   []string{"market_order","addr_status"},
 }
 
-//根据地址和状态,index是实时在变化,要有先后顺序
-var opt_exchange_user_order = &table.Option{
+var opt_exchange_history = &table.Option{
 	Prefix:  KeyPrefixLocalDB,
-	Name:    "UserOrder",
+	Name:    "history",
 	Primary: "index",
-	Index:   nil,
-}
-
-var opt_exchange_completed = &table.Option{
-	Prefix:  KeyPrefixLocalDB,
-	Name:    "completed",
-	Primary: "index",
-	Index:   nil,
+	Index:   []string{"name","addr_status"},
 }
 
 //NewTable 新建表
@@ -77,17 +69,10 @@ func NewMarketOrderTable(kvdb db.KV) *table.Table {
 	return table
 }
 
-func NewUserOrderTable(kvdb db.KV) *table.Table {
-	rowmeta := NewUserOrderRow()
-	table, err := table.NewTable(rowmeta, kvdb, opt_exchange_user_order)
-	if err != nil {
-		panic(err)
-	}
-	return table
-}
-func NewCompletedOrderTable(kvdb db.KV) *table.Table {
-	rowmeta := NewCompletedOrderRow()
-	table, err := table.NewTable(rowmeta, kvdb, opt_exchange_completed)
+
+func NewHistoryOrderTable(kvdb db.KV) *table.Table {
+	rowmeta := NewHistoryOrderRow()
+	table, err := table.NewTable(rowmeta, kvdb, opt_exchange_history)
 	if err != nil {
 		panic(err)
 	}
@@ -124,57 +109,27 @@ func (r *OrderRow) Get(key string) ([]byte, error) {
 		return []byte(fmt.Sprintf("%022d", r.OrderID)), nil
 	} else if key == "market_order" {
 		return []byte(fmt.Sprintf("%s:%s:%d:%016d", r.GetLimitOrder().LeftAsset.GetSymbol(), r.GetLimitOrder().RightAsset.GetSymbol(), r.GetLimitOrder().Op, int64(Truncate(r.GetLimitOrder().Price*float64(1e8))))), nil
+	} else if key == "addr_status"{
+		return []byte(fmt.Sprintf("%s:%d", r.Addr, r.Status)), nil
 	}
 	return nil, types.ErrNotFound
 }
 
-//UserOrderRow table meta 结构
-type UserOrderRow struct {
-	*ety.Order
-}
-
-//NewOrderRow 新建一个meta 结构
-func NewUserOrderRow() *UserOrderRow {
-	return &UserOrderRow{Order: &ety.Order{Value: &ety.Order_LimitOrder{LimitOrder: &ety.LimitOrder{}}}}
-}
-
-//CreateRow
-func (r *UserOrderRow) CreateRow() *table.Row {
-	return &table.Row{Data: &ety.Order{}}
-}
-
-//SetPayload 设置数据
-func (r *UserOrderRow) SetPayload(data types.Message) error {
-	if txdata, ok := data.(*ety.Order); ok {
-		r.Order = txdata
-		return nil
-	}
-	return types.ErrTypeAsset
-}
-
-//Get 按照indexName 查询 indexValue
-func (r *UserOrderRow) Get(key string) ([]byte, error) {
-	if key == "index" {
-		return []byte(fmt.Sprintf("%s:%d:%022d", r.Addr, r.Status, r.Index)), nil
-	}
-	return nil, types.ErrNotFound
-}
-
-//CompletedOrderRow table meta 结构
-type CompletedOrderRow struct {
+//HistoryOrderRow table meta 结构
+type HistoryOrderRow struct {
 	*ety.Order
 }
 
-func NewCompletedOrderRow() *CompletedOrderRow {
-	return &CompletedOrderRow{Order: &ety.Order{Value: &ety.Order_LimitOrder{LimitOrder: &ety.LimitOrder{}}}}
+func NewHistoryOrderRow() *HistoryOrderRow {
+	return &HistoryOrderRow{Order: &ety.Order{Value: &ety.Order_LimitOrder{LimitOrder: &ety.LimitOrder{}}}}
 }
 
-func (m *CompletedOrderRow) CreateRow() *table.Row {
+func (m *HistoryOrderRow) CreateRow() *table.Row {
 	return &table.Row{Data: &ety.Order{Value: &ety.Order_LimitOrder{LimitOrder: &ety.LimitOrder{}}}}
 }
 
 //SetPayload 设置数据
-func (m *CompletedOrderRow) SetPayload(data types.Message) error {
+func (m *HistoryOrderRow) SetPayload(data types.Message) error {
 	if txdata, ok := data.(*ety.Order); ok {
 		m.Order = txdata
 		return nil
@@ -183,9 +138,13 @@ func (m *CompletedOrderRow) SetPayload(data types.Message) error {
 }
 
 //Get 按照indexName 查询 indexValue
-func (m *CompletedOrderRow) Get(key string) ([]byte, error) {
+func (m *HistoryOrderRow) Get(key string) ([]byte, error) {
 	if key == "index" {
-		return []byte(fmt.Sprintf("%s:%s:%022d", m.GetLimitOrder().LeftAsset.GetSymbol(), m.GetLimitOrder().RightAsset.GetSymbol(), m.Index)), nil
+		return []byte(fmt.Sprintf("%022d", m.Index)), nil
+	}else if key == "name"{
+		return []byte(fmt.Sprintf("%s:%s", m.GetLimitOrder().LeftAsset.GetSymbol(), m.GetLimitOrder().RightAsset.GetSymbol())), nil
+	} else if key == "addr_status"{
+		return []byte(fmt.Sprintf("%s:%d", m.Addr, m.Status)), nil
 	}
 	return nil, types.ErrNotFound
 }

plugin/dapp/exchange/proto/exchange.proto

@@ -105,7 +105,7 @@ message MarketDepthList {
 }
 
 //查询最新得成交信息,外部接口
-message QueryCompletedOrderList {
+message QueryHistoryOrderList {
     //资产1
     asset leftAsset  = 1;
     //资产2

plugin/dapp/exchange/types/exchange.go

@@ -23,10 +23,10 @@ const (
 	NameMarketOrderAction = "MarketOrder"
 	NameRevokeOrderAction = "RevokeOrder"
 
-	FuncNameQueryMarketDepth        = "QueryMarketDepth"
-	FuncNameQueryCompletedOrderList = "QueryCompletedOrderList"
-	FuncNameQueryOrder              = "QueryOrder"
-	FuncNameQueryOrderList          = "QueryOrderList"
+	FuncNameQueryMarketDepth      = "QueryMarketDepth"
+	FuncNameQueryHistoryOrderList = "QueryHistoryOrderList"
+	FuncNameQueryOrder            = "QueryOrder"
+	FuncNameQueryOrderList        = "QueryOrderList"
 )
 
 // log类型id值