Merge pull request #75 from webscale-networks/index-overused

Index pattern not always honored

buntdb.go

@@ -454,16 +454,22 @@ func (db *DB) SetConfig(config Config) error {
 // will be replaced with the new one, and return the previous item.
 func (db *DB) insertIntoDatabase(item *dbItem) *dbItem {
 	var pdbi *dbItem
+	idxs := []*index{}
+	for _, idx := range db.idxs {
+		if idx.match(item.key) {
+			idxs = append(idxs, idx)
+		}
+	}
 	prev := db.keys.Set(item)
 	if prev != nil {
 		// A previous item was removed from the keys tree. Let's
 		// fully delete this item from all indexes.
 		pdbi = prev.(*dbItem)
 		if pdbi.opts != nil && pdbi.opts.ex {
-			// Remove it from the exipres tree.
+			// Remove it from the expires tree.
 			db.exps.Delete(pdbi)
 		}
-		for _, idx := range db.idxs {
+		for _, idx := range idxs {
 			if idx.btr != nil {
 				// Remove it from the btree index.
 				idx.btr.Delete(pdbi)
@@ -479,10 +485,7 @@ func (db *DB) insertIntoDatabase(item *dbItem) *dbItem {
 		// expires tree
 		db.exps.Set(item)
 	}
-	for _, idx := range db.idxs {
-		if !idx.match(item.key) {
-			continue
-		}
+	for _, idx := range idxs {
 		if idx.btr != nil {
 			// Add new item to btree index.
 			idx.btr.Set(item)
@@ -512,6 +515,9 @@ func (db *DB) deleteFromDatabase(item *dbItem) *dbItem {
 			db.exps.Delete(pdbi)
 		}
 		for _, idx := range db.idxs {
+			if !idx.match(pdbi.key) {
+				continue
+			}
 			if idx.btr != nil {
 				// Remove it from the btree index.
 				idx.btr.Delete(pdbi)

buntdb_test.go

@@ -1487,6 +1487,62 @@ func TestInsertsAndDeleted(t *testing.T) {
 	}
 }
 
+func TestInsertDoesNotMisuseIndex(t *testing.T) {
+	db := testOpen(t)
+	defer testClose(db)
+	fail := func(a, b string) bool { t.Fatal("Misused index"); return false }
+	if err := db.CreateIndex("some", "a*", fail); err != nil {
+		// Only one item is eligible for the index, so no comparison is necessary.
+		t.Fatal(err)
+	}
+	if err := db.Update(func(tx *Tx) error {
+		if _, _, err := tx.Set("a", "1", nil); err != nil {
+			return err
+		}
+		if _, _, err := tx.Set("b", "1", nil); err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := db.Update(func(tx *Tx) error {
+		_, _, err := tx.Set("b", "2", nil)
+		return err
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestDeleteDoesNotMisuseIndex(t *testing.T) {
+	db := testOpen(t)
+	defer testClose(db)
+	fail := func(a, b string) bool { t.Fatal("Misused index"); return false }
+	if err := db.CreateIndex("some", "a*", fail); err != nil {
+		// Only one item is eligible for the index, so no comparison is necessary.
+		t.Fatal(err)
+	}
+	if err := db.Update(func(tx *Tx) error {
+		if _, _, err := tx.Set("a", "1", nil); err != nil {
+			return err
+		}
+		if _, _, err := tx.Set("b", "1", nil); err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := db.Update(func(tx *Tx) error {
+		_, err := tx.Delete("b")
+		return err
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
 // test index compare functions
 func TestIndexCompare(t *testing.T) {
 	if !IndexFloat("1.5", "1.6") {