Integer and Varchar testcase passed. Varchar(all writes and reads get…

… giant exclusive lock, 50bytes fixed size key)
ryogrid · Sep 12, 2024 · a2c3b4e · a2c3b4e
1 parent b4abaab
commit a2c3b4e
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/lib/storage/index/btree_index.go b/lib/storage/index/btree_index.go
@@ -150,7 +150,11 @@ func (btidx *BTreeIndex) ScanKey(key *tuple.Tuple, txn interface{}) []page.RID {
 	smallestKeyVal := samehada_util.EncodeValueAndRIDToDicOrderComparableVarchar(&orgKeyVal, &page.RID{0, 0})
 	biggestKeyVal := samehada_util.EncodeValueAndRIDToDicOrderComparableVarchar(&orgKeyVal, &page.RID{math.MaxInt32, math.MaxUint32})
 
-	btidx.rwMtx.RLock()
+	if orgKeyVal.ValueType() == types.Varchar {
+		btidx.rwMtx.Lock()
+	} else {
+		btidx.rwMtx.RLock()
+	}
 	// Attention: returned itr's containing keys are string type Value which is constructed with byte arr of concatenated  original key and value
 	rangeItr := btidx.container.GetRangeItr(smallestKeyVal.SerializeOnlyVal(), biggestKeyVal.SerializeOnlyVal())
 
@@ -162,7 +166,11 @@ func (btidx *BTreeIndex) ScanKey(key *tuple.Tuple, txn interface{}) []page.RID {
 		//uintRID := binary.BigEndian.Uint64(eightBytesRID[:])
 		retArr = append(retArr, samehada_util.Unpack8BytesToRID(eightBytesRID[:]))
 	}
-	btidx.rwMtx.RUnlock()
+	if orgKeyVal.ValueType() == types.Varchar {
+		btidx.rwMtx.Unlock()
+	} else {
+		btidx.rwMtx.RUnlock()
+	}
 
 	return retArr
 }
@@ -192,8 +200,13 @@ func (btidx *BTreeIndex) GetRangeScanIterator(start_key *tuple.Tuple, end_key *t
 		biggestKeyVal = samehada_util.EncodeValueAndRIDToDicOrderComparableVarchar(&orgEndKeyVal, &page.RID{math.MaxInt32, math.MaxUint32})
 	}
 
-	btidx.rwMtx.RLock()
-	defer btidx.rwMtx.RUnlock()
+	if tupleSchema_.GetColumns()[btidx.col_idx].GetType() == types.Varchar {
+		btidx.rwMtx.Lock()
+		defer btidx.rwMtx.Unlock()
+	} else {
+		btidx.rwMtx.RLock()
+		defer btidx.rwMtx.RUnlock()
+	}
 	var smalledKeyBytes []byte
 	var biggestKeyBytes []byte