mv getObject to Object

db/expire.go

@@ -116,21 +116,6 @@ func toTikvDataKey(namespace []byte, id DBID, key []byte) []byte {
 	return b
 }
 
-func getObject(txn *Transaction, mkey []byte) (*Object, error) {
-	rawObj, err := txn.t.Get(mkey)
-	if err != nil {
-		zap.L().Error("[Expire] get meta failed", zap.ByteString("prefix", expireKeyPrefix), zap.Error(err))
-		return nil, err
-	}
-	obj, err := DecodeObject(rawObj)
-	if err != nil {
-		zap.L().Error("[Expire] decode meta failed", zap.ByteString("prefix", expireKeyPrefix), zap.Error(err))
-		return nil, err
-
-	}
-	return obj, nil
-}
-
 func runExpire(db *DB, batchLimit int) {
 	txn, err := db.Begin()
 	if err != nil {

db/object.go

@@ -112,17 +112,8 @@ func (obj *Object) String() string {
 
 // Object new object thougth key
 func (txn *Transaction) Object(key []byte) (*Object, error) {
-	obj := &Object{}
 	mkey := MetaKey(txn.db, key)
-
-	meta, err := txn.t.Get(mkey)
-	if err != nil {
-		if IsErrNotFound(err) {
-			return nil, ErrKeyNotFound
-		}
-		return nil, err
-	}
-	obj, err = DecodeObject(meta)
+	obj, err := getObject(txn, mkey)
 	if err != nil {
 		return nil, err
 	}
@@ -153,3 +144,19 @@ func (txn *Transaction) Destory(obj *Object, key []byte) error {
 
 	return nil
 }
+
+func getObject(txn *Transaction, metaKey []byte) (*Object, error) {
+	obj := &Object{}
+	meta, err := txn.t.Get(metaKey)
+	if err != nil {
+		if IsErrNotFound(err) {
+			return nil, ErrKeyNotFound
+		}
+		return nil, err
+	}
+	obj, err = DecodeObject(meta)
+	if err != nil {
+		return nil, err
+	}
+	return obj, nil
+}