Merge branch 'master' into feature-grpc-sub

Author: libangzhu

blockchain/blockchain_test.go

@@ -7,14 +7,14 @@ package blockchain
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCalcHeightToBlockHeaderKey(t *testing.T) {
 	key := calcHeightToBlockHeaderKey(1)
-	assert.Equal(t, key, []byte("HH:000000000001"))
+	require.Equal(t, key, []byte("HH:000000000001"))
 	key = calcHeightToBlockHeaderKey(0)
-	assert.Equal(t, key, []byte("HH:000000000000"))
+	require.Equal(t, key, []byte("HH:000000000000"))
 	key = calcHeightToBlockHeaderKey(10)
-	assert.Equal(t, key, []byte("HH:000000000010"))
+	require.Equal(t, key, []byte("HH:000000000010"))
 }

blockchain/blockstore.go

@@ -88,9 +88,9 @@ func calcHeightToBlockHeaderKey(height int64) []byte {
 }
 
 //存储block hash对应的block height
-func calcHashToHeightKey(hash []byte) []byte {
-	return append(hashPrefix, hash...)
-}
+//func calcHashToHeightKey(hash []byte) []byte {
+//	return append(hashPrefix, hash...)
+//}
 
 //存储block hash对应的block总难度TD
 func calcHashToTdKey(hash []byte) []byte {
@@ -407,6 +407,9 @@ func (bs *BlockStore) HasTx(key []byte) (bool, error) {
 		//通过短hash查询交易存在时，需要再通过全hash索引查询一下。
 		//避免短hash重复，而全hash不一样的情况
 		//return true, nil
+		// 查重性能对比：
+		// 先查短哈希，再查全哈希，单次查询平均耗时10000ns
+		// 直接查全哈希，单次查询平均耗时24000ns
 	}
 	if _, err := bs.db.Get(cfg.CalcTxKey(key)); err != nil {
 		if err == dbm.ErrNotFoundInDb {
@@ -570,7 +573,7 @@ func (bs *BlockStore) SaveBlock(storeBatch dbm.Batch, blockdetail *types.BlockDe
 	storeBatch.Set(blockLastHeight, heightbytes)
 
 	//存储block hash和height的对应关系，便于通过hash查询block
-	storeBatch.Set(calcHashToHeightKey(hash), heightbytes)
+	//storeBatch.Set(calcHashToHeightKey(hash), heightbytes)
 
 	//存储block height和block hash的对应关系，便于通过height查询block
 	storeBatch.Set(calcHeightToHashKey(height), hash)
@@ -618,7 +621,7 @@ func (bs *BlockStore) DelBlock(storeBatch dbm.Batch, blockdetail *types.BlockDet
 	storeBatch.Set(blockLastHeight, bytes)
 
 	//删除block hash和height的对应关系
-	storeBatch.Delete(calcHashToHeightKey(hash))
+	//storeBatch.Delete(calcHashToHeightKey(hash))
 
 	//删除block height和block hash的对应关系，便于通过height查询block
 	storeBatch.Delete(calcHeightToHashKey(height))
@@ -748,17 +751,17 @@ func (bs *BlockStore) DelTxs(storeBatch dbm.Batch, blockDetail *types.BlockDetai
 }
 
 //GetHeightByBlockHash 从db数据库中获取指定hash对应的block高度
-func (bs *BlockStore) GetHeightByBlockHash(hash []byte) (int64, error) {
-
-	heightbytes, err := bs.db.Get(calcHashToHeightKey(hash))
-	if heightbytes == nil || err != nil {
-		if err != dbm.ErrNotFoundInDb {
-			storeLog.Error("GetHeightByBlockHash", "error", err)
-		}
-		return -1, types.ErrHashNotExist
-	}
-	return decodeHeight(heightbytes)
-}
+//func (bs *BlockStore) GetHeightByBlockHash(hash []byte) (int64, error) {
+//
+//	heightbytes, err := bs.db.Get(calcHashToHeightKey(hash))
+//	if heightbytes == nil || err != nil {
+//		if err != dbm.ErrNotFoundInDb {
+//			storeLog.Error("GetHeightByBlockHash", "error", err)
+//		}
+//		return -1, types.ErrHashNotExist
+//	}
+//	return decodeHeight(heightbytes)
+//}
 
 func decodeHeight(heightbytes []byte) (int64, error) {
 	var height types.Int64
@@ -767,7 +770,7 @@ func decodeHeight(heightbytes []byte) (int64, error) {
 		//may be old database format json...
 		err = json.Unmarshal(heightbytes, &height.Data)
 		if err != nil {
-			storeLog.Error("GetHeightByBlockHash Could not unmarshal height bytes", "error", err)
+			storeLog.Error("decodeHeight could not unmarshal height bytes", "error", err)
 			return -1, types.ErrUnmarshal
 		}
 	}