Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get rid of effect group part in paging tokens #17

Merged
merged 1 commit into from
Jan 22, 2020
Merged

Get rid of effect group part in paging tokens #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions es/balance_extractor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ func (e *BalanceExtractor) created(change xdr.LedgerEntryChange) {

func (e *BalanceExtractor) updated(change xdr.LedgerEntryChange) {
updated := change.MustUpdated().Data
e.index++
pagingToken := PagingToken{EffectIndex: e.index}.Merge(e.basePagingToken)

switch x := updated.Type; x {
case xdr.LedgerEntryTypeAccount:
Expand All @@ -109,6 +107,8 @@ func (e *BalanceExtractor) updated(change xdr.LedgerEntryChange) {

if oldBalance != account.Balance {
diff := account.Balance - oldBalance
e.index++
pagingToken := PagingToken{EffectIndex: e.index}.Merge(e.basePagingToken)

e.balances = append(
e.balances,
Expand All @@ -122,6 +122,8 @@ func (e *BalanceExtractor) updated(change xdr.LedgerEntryChange) {

if oldBalance != line.Balance {
diff := line.Balance - oldBalance
e.index++
pagingToken := PagingToken{EffectIndex: e.index}.Merge(e.basePagingToken)

e.balances = append(
e.balances,
Expand Down
46 changes: 26 additions & 20 deletions es/ledger_serializer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,15 @@ func (s *ledgerSerializer) serialize() {

if transaction.Successful {
changes := s.feeRows[transaction.Index-1].Changes
s.serializeBalances(changes, transaction, nil, BalanceSourceFee, FeeEffectPagingTokenGroup)
s.serializeBalances(changes, transaction, nil, BalanceSourceFee)
}

s.serializeOperations(transactionRow, transaction)
}
}

func (s *ledgerSerializer) serializeOperations(transactionRow db.TxHistoryRow, transaction *Transaction) {
effectsCount := 0
xdrs := transactionRow.Operations()

for index, xdr := range xdrs {
Expand All @@ -58,10 +59,10 @@ func (s *ledgerSerializer) serializeOperations(transactionRow db.TxHistoryRow, t
if transaction.Successful {
metas := transactionRow.MetasFor(index)
if metas != nil {
s.serializeBalances(metas.Changes, transaction, operation, BalanceSourceMeta, BalanceEffectPagingTokenGroup)
effectsCount = s.serializeBalances(metas.Changes, transaction, operation, BalanceSourceMeta)
}

s.serializeTrades(result, transaction, operation)
s.serializeTrades(result, transaction, operation, effectsCount)

h := ProduceSignerHistory(operation)
if h != nil {
Expand All @@ -71,39 +72,44 @@ func (s *ledgerSerializer) serializeOperations(transactionRow db.TxHistoryRow, t
}
}

func (s *ledgerSerializer) serializeBalances(changes xdr.LedgerEntryChanges, transaction *Transaction, operation *Operation, source BalanceSource, effectGroup int) {
if len(changes) > 0 {
pagingToken := PagingToken{
LedgerSeq: s.ledger.Seq,
TransactionOrder: transaction.Index,
EffectGroup: effectGroup,
}
func (s *ledgerSerializer) serializeBalances(changes xdr.LedgerEntryChanges, transaction *Transaction, operation *Operation, source BalanceSource) int {
if len(changes) == 0 {
return 0
}

if operation != nil {
pagingToken.OperationOrder = operation.Index
}
pagingToken := PagingToken{
LedgerSeq: s.ledger.Seq,
TransactionOrder: transaction.Index,
}

balances := ProduceBalances(changes, s.ledger.CloseTime, source, pagingToken)
if operation != nil {
pagingToken.OperationOrder = operation.Index
}

if len(balances) > 0 {
for _, balance := range balances {
SerializeForBulk(balance, s.buffer)
}
balances := ProduceBalances(changes, s.ledger.CloseTime, source, pagingToken)

if len(balances) > 0 {
for _, balance := range balances {
SerializeForBulk(balance, s.buffer)
}
}

return len(balances)
}

func (s *ledgerSerializer) serializeTrades(result *xdr.OperationResult, transaction *Transaction, operation *Operation) {
func (s *ledgerSerializer) serializeTrades(result *xdr.OperationResult, transaction *Transaction, operation *Operation, startIndex int) int {
pagingToken := PagingToken{
LedgerSeq: s.ledger.Seq,
TransactionOrder: transaction.Index,
OperationOrder: operation.Index,
}

trades := ProduceTrades(result, operation, s.ledger.CloseTime, pagingToken)
trades := ProduceTrades(result, operation, s.ledger.CloseTime, pagingToken, startIndex)
if len(trades) > 0 {
for _, trade := range trades {
SerializeForBulk(&trade, s.buffer)
}
}

return len(trades)
}
21 changes: 0 additions & 21 deletions es/paging_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,21 @@ type PagingToken struct {
LedgerSeq int
TransactionOrder int
OperationOrder int
EffectGroup int
EffectIndex int
}

var (
ledgerFormat = "%012d"
transactionFormat = "%04d"
operationFormat = "%04d"
effectGroupFormat = "%04d"
effectIndexFormat = "%04d"

// BalanceEffectPagingTokenGroup represents balance entry taken from result meta
BalanceEffectPagingTokenGroup = 1

// FeeEffectPagingTokenGroup represents balance entry taken from fee meta
FeeEffectPagingTokenGroup = 2

// TradeEffectPagingTokenGroup represent trade effects
TradeEffectPagingTokenGroup = 3

// SignerHistoryEffectPagingTokenGroup represent signer effects
SignerHistoryEffectPagingTokenGroup = 4
)

// String returns string representation of order
func (o PagingToken) String() (result string) {
return fmt.Sprintf(ledgerFormat, o.LedgerSeq) + "-" +
fmt.Sprintf(transactionFormat, o.TransactionOrder) + "-" +
fmt.Sprintf(operationFormat, o.OperationOrder) + "-" +
fmt.Sprintf(effectGroupFormat, o.EffectGroup) + "-" +
fmt.Sprintf(effectIndexFormat, o.EffectIndex)
}

Expand Down Expand Up @@ -69,12 +54,6 @@ func (o PagingToken) Merge(n PagingToken) (result PagingToken) {
result.OperationOrder = n.OperationOrder
}

if o.EffectGroup != 0 {
result.EffectGroup = o.EffectGroup
} else {
result.EffectGroup = n.EffectGroup
}

if o.EffectIndex != 0 {
result.EffectIndex = o.EffectIndex
} else {
Expand Down
4 changes: 2 additions & 2 deletions es/serialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ func SerializeForBulk(obj Indexable, b *bytes.Buffer) {

if id != nil {
meta = fmt.Sprintf(
`{ "index": { "_index": "%s", "_id": "%s", "_type": "_doc" } }%s`,
`{ "create": { "_index": "%s", "_id": "%s", "_type": "_doc" } }%s`,
obj.IndexName(),
*id,
"\n",
)
} else {
meta = fmt.Sprintf(
`{ "index": { "_index": "%s", "_type": "_doc" } }%s`, obj.IndexName(), "\n",
`{ "create": { "_index": "%s", "_type": "_doc" } }%s`, obj.IndexName(), "\n",
)
}

Expand Down
1 change: 0 additions & 1 deletion es/signer_history.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ func ProduceSignerHistory(o *Operation) (h *SignerHistory) {
LedgerSeq: o.Seq,
TransactionOrder: o.TxIndex,
OperationOrder: o.Index,
EffectGroup: SignerHistoryEffectPagingTokenGroup,
}

entry := &SignerHistory{
Expand Down
7 changes: 4 additions & 3 deletions es/trade_extractor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ type TradeExtractor struct {
}

// ProduceTrades returns trades
func ProduceTrades(r *xdr.OperationResult, op *Operation, closeTime time.Time, pagingToken PagingToken) (trades []Trade) {
func ProduceTrades(r *xdr.OperationResult, op *Operation, closeTime time.Time, pagingToken PagingToken, startIndex int) (trades []Trade) {
extractor := &TradeExtractor{
result: r,
closeTime: closeTime,
pagingToken: pagingToken,
operation: op,
tokenIndex: startIndex,
}

if extractor == nil {
Expand Down Expand Up @@ -130,15 +131,15 @@ func (e *TradeExtractor) fetchFromPathPaymentStrictSend(result xdr.PathPaymentSt

func (e *TradeExtractor) fetchClaims(claims []xdr.ClaimOfferAtom, accountID string) (trades []Trade) {
for _, claim := range claims {
pagingTokenA := PagingToken{EffectGroup: TradeEffectPagingTokenGroup, EffectIndex: e.tokenIndex + 1}.Merge(e.pagingToken)
pagingTokenA := PagingToken{EffectIndex: e.tokenIndex + 1}.Merge(e.pagingToken)

tradeA := Trade{
PagingToken: pagingTokenA,
OfferID: int64(claim.OfferId),
LedgerCloseTime: e.closeTime,
}

pagingTokenB := PagingToken{EffectGroup: TradeEffectPagingTokenGroup, EffectIndex: e.tokenIndex + 2}.Merge(e.pagingToken)
pagingTokenB := PagingToken{EffectIndex: e.tokenIndex + 2}.Merge(e.pagingToken)

tradeB := Trade{
PagingToken: pagingTokenB,
Expand Down