release: 10.2.2 (#1029)

* fix: remove poor performing query from AddOrders (#1028)

* remove extremely inefficient query from AddOrders procedure

Move the routine to the order watcher cleanup loop.

* fix typo

* bump version in core.go

* cut release 10.2.2

README.md

@@ -1,4 +1,4 @@
-[![Version](https://img.shields.io/badge/version-10.2.1-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
+[![Version](https://img.shields.io/badge/version-10.2.2-orange.svg)](https://github.com/0xProject/0x-mesh/releases)
 [![Docs](https://img.shields.io/badge/docs-website-yellow.svg)](https://0x-org.gitbook.io/mesh)
 [![Chat with us on Discord](https://img.shields.io/badge/chat-Discord-blueViolet.svg)](https://discord.gg/HF7fHwk)
 [![Circle CI](https://img.shields.io/circleci/project/0xProject/0x-mesh/master.svg)](https://circleci.com/gh/0xProject/0x-mesh/tree/master)

core/core.go

@@ -56,7 +56,7 @@ const (
 	estimatedNonPollingEthereumRPCRequestsPer24Hrs = 50000
 	// logStatsInterval is how often to log stats for this node.
 	logStatsInterval = 5 * time.Minute
-	version          = "10.2.1"
+	version          = "10.2.2"
 	// ordersyncMinPeers is the minimum amount of peers to receive orders from
 	// before considering the ordersync process finished.
 	ordersyncMinPeers = 5

db/sql_implementation.go

@@ -386,34 +386,6 @@ func (db *DB) AddOrders(orders []*types.OrderWithMetadata) (alreadyStored []comm
 			}
 		}
 
-		// Remove orders with an expiration time too far in the future.
-		// HACK(albrow): sqlz doesn't support ORDER BY, LIMIT, and OFFSET
-		// for DELETE statements. It also doesn't support RETURNING. As a
-		// workaround, we do a SELECT and DELETE inside a transaction.
-		// HACK(albrow): SQL doesn't support limit without offset. As a
-		// workaround, we set the limit to an extremely large number.
-		removeQuery := txn.Select("*").From("orders").
-			OrderBy(sqlz.Desc(string(OFIsPinned)), sqlz.Asc(string(OFExpirationTimeSeconds))).
-			Limit(largeLimit).
-			Offset(int64(db.opts.MaxOrders))
-		var ordersToRemove []*sqltypes.Order
-		err = removeQuery.GetAllContext(db.ctx, &ordersToRemove)
-		if err != nil {
-			return err
-		}
-		for _, order := range ordersToRemove {
-			_, err := txn.DeleteFrom("orders").Where(sqlz.Eq(string(OFHash), order.Hash)).ExecContext(db.ctx)
-			if err != nil {
-				return err
-			}
-			if _, found := addedMap[order.Hash]; found {
-				// If the order was previously added, remove it from
-				// the added set and don't add it to the removed set.
-				delete(addedMap, order.Hash)
-			} else {
-				sqlRemoved = append(sqlRemoved, order)
-			}
-		}
 		return nil
 	})
 	if err != nil {
@@ -498,6 +470,36 @@ func (db *DB) FindOrders(query *OrderQuery) (orders []*types.OrderWithMetadata,
 	return sqltypes.OrdersToCommonType(foundOrders), nil
 }
 
+// Remove orders with an expiration time too far in the future.
+func (db *DB) RemoveOrdersWithLongExpiration() ([]*sqltypes.Order, error) {
+	sqlRemoved := []*sqltypes.Order{}
+	return sqlRemoved, db.ReadWriteTransactionalContext(db.ctx, nil, func(txn *sqlz.Tx) error {
+		// HACK(albrow): sqlz doesn't support ORDER BY, LIMIT, and OFFSET
+		// for DELETE statements. It also doesn't support RETURNING. As a
+		// workaround, we do a SELECT and DELETE inside a transaction.
+		// HACK(albrow): SQL doesn't support limit without offset. As a
+		// workaround, we set the limit to an extremely large number.
+		removeQuery := txn.Select("*").From("orders").
+			OrderBy(sqlz.Desc(string(OFIsPinned)), sqlz.Asc(string(OFExpirationTimeSeconds))).
+			Limit(largeLimit).
+			Offset(int64(db.opts.MaxOrders))
+		var ordersToRemove []*sqltypes.Order
+		err := removeQuery.GetAllContext(db.ctx, &sqlRemoved)
+		if err != nil {
+			return err
+		}
+		for _, order := range ordersToRemove {
+			_, err := txn.DeleteFrom("orders").Where(sqlz.Eq(string(OFHash), order.Hash)).ExecContext(db.ctx)
+			if err != nil {
+				return err
+			}
+			sqlRemoved = append(sqlRemoved, order)
+		}
+
+		return nil
+	})
+}
+
 func (db *DB) CountOrders(query *OrderQuery) (count int, err error) {
 	defer func() {
 		err = convertErr(err)

docs/browser-bindings/browser-lite/README.md

@@ -1,4 +1,4 @@
-# @0x/mesh-browser-lite - v10.2.1
+# @0x/mesh-browser-lite - v10.2.2
 
 ## @0x/mesh-browser-lite