table refactor

plugin/dapp/guess/executor/guessdb.go

@@ -123,8 +123,8 @@ func Key(id string) (key []byte) {
 	return key
 }
 
-//QueryGameInfos 根据游戏id列表查询多个游戏详情信息
-func QueryGameInfos(kvdb db.KVDB, infos *gty.QueryGuessGameInfos) (types.Message, error) {
+//queryGameInfos 根据游戏id列表查询多个游戏详情信息
+func queryGameInfos(kvdb db.KVDB, infos *gty.QueryGuessGameInfos) (types.Message, error) {
 	var games []*gty.GuessGame
 	gameTable := gty.NewGuessGameTable(kvdb)
 	query := gameTable.GetQuery(kvdb)
@@ -141,8 +141,8 @@ func QueryGameInfos(kvdb db.KVDB, infos *gty.QueryGuessGameInfos) (types.Message
 	return &gty.ReplyGuessGameInfos{Games: games}, nil
 }
 
-//QueryGameInfo 根据gameid查询game信息
-func QueryGameInfo(kvdb db.KVDB, gameID []byte) (*gty.GuessGame, error) {
+//queryGameInfo 根据gameid查询game信息
+func queryGameInfo(kvdb db.KVDB, gameID []byte) (*gty.GuessGame, error) {
 	gameTable := gty.NewGuessGameTable(kvdb)
 	query := gameTable.GetQuery(kvdb)
 	rows, err := query.ListIndex("gameid", gameID, nil, 1, 0)
@@ -155,8 +155,8 @@ func QueryGameInfo(kvdb db.KVDB, gameID []byte) (*gty.GuessGame, error) {
 	return game, nil
 }
 
-//QueryUserTableData 查询user表数据
-func QueryUserTableData(query *table.Query, indexName string, prefix, primaryKey []byte) (types.Message, error) {
+//queryUserTableData 查询user表数据
+func queryUserTableData(query *table.Query, indexName string, prefix, primaryKey []byte) (types.Message, error) {
 	rows, err := query.ListIndex(indexName, prefix, primaryKey, DefaultCount, 0)
 	if err != nil {
 		return nil, err
@@ -182,8 +182,8 @@ func QueryUserTableData(query *table.Query, indexName string, prefix, primaryKey
 	return &gty.GuessGameRecords{Records: records, PrimaryKey: primary}, nil
 }
 
-//QueryGameTableData 查询game表数据
-func QueryGameTableData(query *table.Query, indexName string, prefix, primaryKey []byte) (types.Message, error) {
+//queryGameTableData 查询game表数据
+func queryGameTableData(query *table.Query, indexName string, prefix, primaryKey []byte) (types.Message, error) {
 	rows, err := query.ListIndex(indexName, prefix, primaryKey, DefaultCount, 0)
 	if err != nil {
 		return nil, err
@@ -209,8 +209,8 @@ func QueryGameTableData(query *table.Query, indexName string, prefix, primaryKey
 	return &gty.GuessGameRecords{Records: records, PrimaryKey: primary}, nil
 }
 
-//QueryJoinTableData 查询join表数据
-func QueryJoinTableData(talbeJoin *table.JoinTable, indexName string, prefix, primaryKey []byte) (types.Message, error) {
+//queryJoinTableData 查询join表数据
+func queryJoinTableData(talbeJoin *table.JoinTable, indexName string, prefix, primaryKey []byte) (types.Message, error) {
 	rows, err := talbeJoin.ListIndex(indexName, prefix, primaryKey, DefaultCount, 0)
 	if err != nil {
 		return nil, err
@@ -414,7 +414,7 @@ func (action *Action) GameBet(pbBet *gty.GuessGameBet) (*types.Receipt, error) {
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-	game, err := QueryGameInfo(action.localDB, []byte(pbBet.GetGameID()))
+	game, err := queryGameInfo(action.localDB, []byte(pbBet.GetGameID()))
 	if err != nil || game == nil {
 		logger.Error("GameBet", "addr", action.fromaddr, "execaddr", action.execaddr, "get game failed",
 			pbBet.GetGameID(), "err", err)
@@ -510,7 +510,7 @@ func (action *Action) GameStopBet(pbBet *gty.GuessGameStopBet) (*types.Receipt,
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-	game, err := QueryGameInfo(action.localDB, []byte(pbBet.GetGameID()))
+	game, err := queryGameInfo(action.localDB, []byte(pbBet.GetGameID()))
 	if err != nil || game == nil {
 		logger.Error("GameStopBet", "addr", action.fromaddr, "execaddr", action.execaddr, "get game failed",
 			pbBet.GetGameID(), "err", err)
@@ -572,7 +572,7 @@ func (action *Action) GamePublish(publish *gty.GuessGamePublish) (*types.Receipt
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-	game, err := QueryGameInfo(action.localDB, []byte(publish.GetGameID()))
+	game, err := queryGameInfo(action.localDB, []byte(publish.GetGameID()))
 	if err != nil || game == nil {
 		logger.Error("GamePublish", "addr", action.fromaddr, "execaddr", action.execaddr, "get game failed",
 			publish.GetGameID(), "err", err)
@@ -718,7 +718,7 @@ func (action *Action) GameAbort(pbend *gty.GuessGameAbort) (*types.Receipt, erro
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-	game, err := QueryGameInfo(action.localDB, []byte(pbend.GetGameID()))
+	game, err := queryGameInfo(action.localDB, []byte(pbend.GetGameID()))
 	if err != nil || game == nil {
 		logger.Error("GameAbort", "addr", action.fromaddr, "execaddr", action.execaddr, "get game failed",
 			pbend.GetGameID(), "err", err)

plugin/dapp/guess/executor/query.go

@@ -14,12 +14,12 @@ import (
 
 //Query_QueryGamesByIDs method
 func (g *Guess) Query_QueryGamesByIDs(in *gty.QueryGuessGameInfos) (types.Message, error) {
-	return QueryGameInfos(g.GetLocalDB(), in)
+	return queryGameInfos(g.GetLocalDB(), in)
 }
 
 //Query_QueryGameByID method
 func (g *Guess) Query_QueryGameByID(in *gty.QueryGuessGameInfo) (types.Message, error) {
-	game, err := QueryGameInfo(g.GetLocalDB(), []byte(in.GetGameID()))
+	game, err := queryGameInfo(g.GetLocalDB(), []byte(in.GetGameID()))
 	if err != nil {
 		return nil, err
 	}
@@ -32,7 +32,7 @@ func (g *Guess) Query_QueryGamesByAddr(in *gty.QueryGuessGameInfo) (types.Messag
 	gameTable := gty.NewGuessUserTable(g.GetLocalDB())
 	query := gameTable.GetQuery(g.GetLocalDB())
 
-	return QueryUserTableData(query, "addr", []byte(in.Addr), in.PrimaryKey)
+	return queryUserTableData(query, "addr", []byte(in.Addr), in.PrimaryKey)
 }
 
 //Query_QueryGamesByStatus method
@@ -40,7 +40,7 @@ func (g *Guess) Query_QueryGamesByStatus(in *gty.QueryGuessGameInfo) (types.Mess
 	gameTable := gty.NewGuessGameTable(g.GetLocalDB())
 	query := gameTable.GetQuery(g.GetLocalDB())
 
-	return QueryGameTableData(query, "status", []byte(fmt.Sprintf("%2d", in.Status)), in.PrimaryKey)
+	return queryGameTableData(query, "status", []byte(fmt.Sprintf("%2d", in.Status)), in.PrimaryKey)
 }
 
 //Query_QueryGamesByAdminAddr method
@@ -48,7 +48,7 @@ func (g *Guess) Query_QueryGamesByAdminAddr(in *gty.QueryGuessGameInfo) (types.M
 	gameTable := gty.NewGuessGameTable(g.GetLocalDB())
 	query := gameTable.GetQuery(g.GetLocalDB())
 	prefix := []byte(in.AdminAddr)
-	return QueryGameTableData(query, "admin", prefix, in.PrimaryKey)
+	return queryGameTableData(query, "admin", prefix, in.PrimaryKey)
 }
 
 //Query_QueryGamesByAddrStatus method
@@ -62,7 +62,7 @@ func (g *Guess) Query_QueryGamesByAddrStatus(in *gty.QueryGuessGameInfo) (types.
 
 	prefix := table.JoinKey([]byte(in.Addr), []byte(fmt.Sprintf("%2d", in.Status)))
 
-	return QueryJoinTableData(tableJoin, "addr#status", prefix, in.PrimaryKey)
+	return queryJoinTableData(tableJoin, "addr#status", prefix, in.PrimaryKey)
 }
 
 //Query_QueryGamesByAdminStatus method
@@ -71,7 +71,7 @@ func (g *Guess) Query_QueryGamesByAdminStatus(in *gty.QueryGuessGameInfo) (types
 	query := gameTable.GetQuery(g.GetLocalDB())
 	prefix := []byte(fmt.Sprintf("%s:%2d", in.AdminAddr, in.Status))
 
-	return QueryGameTableData(query, "admin_status", prefix, in.PrimaryKey)
+	return queryGameTableData(query, "admin_status", prefix, in.PrimaryKey)
 }
 
 //Query_QueryGamesByCategoryStatus method
@@ -80,5 +80,5 @@ func (g *Guess) Query_QueryGamesByCategoryStatus(in *gty.QueryGuessGameInfo) (ty
 	query := gameTable.GetQuery(g.GetLocalDB())
 	prefix := []byte(fmt.Sprintf("%s:%2d", in.Category, in.Status))
 
-	return QueryGameTableData(query, "category_status", prefix, in.PrimaryKey)
+	return queryGameTableData(query, "category_status", prefix, in.PrimaryKey)
 }