Merge pull request #5 from seebs/delete

Delete hackery

executor.go

@@ -8351,13 +8351,17 @@ func (e *executor) executeDeleteRecordFromShard(ctx context.Context, qcx *Qcx, i
 	if len(row.segments) == 0 { //nothing to remove
 		return false, nil
 	}
+	columns := row.segments[0].data //should only be one segment
+	if columns.Count() == 0 {
+		return false, nil
+	}
 
 	// Fetch index.
 	idx := e.Holder.Index(index)
 	if idx == nil {
 		return false, newNotFoundError(ErrIndexNotFound, index)
 	}
-	columns := row.segments[0].data //should only be one segment
+
 	columnIDs := make([]uint64, 0)
 	none := make([]uint64, 0) // no bits will be set
 
@@ -8367,22 +8371,27 @@ func (e *executor) executeDeleteRecordFromShard(ctx context.Context, qcx *Qcx, i
 	}
 	defer finisher(&err)
 	changed := false
-	clearFragment := func(frag *fragment) (bool, error) {
-		toClear := columnIDs[:0]
-		rowSet := make(map[uint64]struct{})
+	colCounts := make([]int, 0)
+	toClear := columnIDs[:0]
+	rowSet := make(map[uint64]struct{})
+	callback := func(pos uint64) error {
+		toClear = append(toClear, pos)
+		rowID := pos / ShardWidth
+		rowSet[rowID] = struct{}{}
+		return nil
+	}
+	findExisting := roaring.NewBitmapBitmapFilter(columns, callback)
 
-		callback := func(pos uint64) error {
-			toClear = append(toClear, pos)
-			rowID := pos / ShardWidth
-			rowSet[rowID] = struct{}{}
-			return nil
-		}
-		findExisting := roaring.NewBitmapBitmapFilter(columns, callback)
+	clearFragment := func(frag *fragment) (bool, error) {
+		// re-zero these
+		toClear = columnIDs[:0]
+		rowSet = make(map[uint64]struct{})
 
 		err = tx.ApplyFilter(frag.index(), frag.field(), frag.view(), frag.shard, 0, findExisting)
 		if err != nil {
 			return false, err
 		}
+		colCounts = append(colCounts, len(toClear))
 		// this will be the remove part
 		if len(toClear) > 0 {
 			err = frag.importPositions(tx, none, toClear, rowSet)
@@ -8409,22 +8418,5 @@ func (e *executor) executeDeleteRecordFromShard(ctx context.Context, qcx *Qcx, i
 			}
 		}
 	}
-	if idx.trackExistence {
-		for _, view := range idx.existenceFld.views() {
-			frag, ok := view.fragments[shard]
-			if !ok {
-				continue
-			}
-			for _, bit := range columns.Slice() {
-				c, err := frag.clearBit(tx, 0, bit)
-				if err != nil {
-					return false, nil
-				}
-				if c {
-					changed = true
-				}
-			}
-		}
-	}
 	return changed, nil
 }

rbf/cursorx.go

@@ -197,9 +197,9 @@ func intoContainer(l leafCell, tx *Tx, replacing *roaring.Container, target []by
 		}
 		c = roaring.RemakeContainerBitmap(replacing, cloneMaybe)
 	case ContainerTypeBitmap:
-		c = roaring.RemakeContainerBitmap(replacing, toArray64(cpMaybe))
+		c = roaring.RemakeContainerBitmapN(replacing, toArray64(cpMaybe), int32(l.BitN))
 	case ContainerTypeRLE:
-		c = roaring.RemakeContainerRun(replacing, toInterval16(cpMaybe))
+		c = roaring.RemakeContainerRunN(replacing, toInterval16(cpMaybe), int32(l.BitN))
 	}
 	// Note: If the "roaringparanoia" build tag isn't set, this
 	// should be optimized away entirely. Otherwise it's moderately

roaring/container_stash.go

@@ -125,6 +125,8 @@ func NewContainer() *Container {
 	return NewContainerArray(nil)
 }
 
+// RemakeContainerBitmap overwrites the contents of c, which must not be
+// frozen, with a provided bitmap, and computes a correct N.
 func RemakeContainerBitmap(c *Container, bitmap []uint64) *Container {
 	*c = Container{typeID: ContainerBitmap}
 	c.setBitmap(bitmap)
@@ -132,15 +134,41 @@ func RemakeContainerBitmap(c *Container, bitmap []uint64) *Container {
 	return c
 }
 
+// RemakeContainerBitmapN uses the provided n instead of counting bits. The
+// provided container must not be frozen.
+func RemakeContainerBitmapN(c *Container, bitmap []uint64, n int32) *Container {
+	*c = Container{typeID: ContainerBitmap}
+	c.setBitmap(bitmap)
+	c.n = n
+	return c
+}
+
+// RemakeContainerArray populates c with an array container using the provided
+// array. It must not be used on a frozen container.
 func RemakeContainerArray(c *Container, array []uint16) *Container {
 	*c = Container{typeID: ContainerArray}
 	c.setArray(array)
 	return c
 }
 
+// RemakeContainerRun repopulates c with the provided intervals. c must not
+// be frozen.
 func RemakeContainerRun(c *Container, intervals []Interval16) *Container {
 	*c = Container{typeID: ContainerRun}
 	c.setRuns(intervals)
+	c.n = 0
+	for _, r := range intervals {
+		c.n += int32(r.Last - r.Start + 1)
+	}
+	return c
+}
+
+// RemakeContainerRunN repopulates c with the provided intervals, but
+// assumes the provided n is accurate. c must not be frozen.
+func RemakeContainerRunN(c *Container, intervals []Interval16, n int32) *Container {
+	*c = Container{typeID: ContainerRun}
+	c.setRuns(intervals)
+	c.n = n
 	return c
 }