Merge pull request #146 from disney/tpch-support

Merge fixes to develop for release candidate 3

server/bitmap.go

@@ -1386,6 +1386,9 @@ func (m *BitmapIndex) PartitionInfo(ctx context.Context,
 		if req.Index != "" && p.Index != req.Index {
 			return nil
 		}
+		if p.TQType == "" {
+			return nil
+		}
         bsi := p.Shard.(*BSIBitmap)
 		r := &pb.PartitionInfoResult{Time: p.Time.UnixNano(), Index: p.Index, Field: p.Field,
 			RowIdOrValue: p.RowIDOrBits * -1, ModTime: bsi.ModTime.UnixNano(), TqType: p.TQType}
@@ -1407,6 +1410,9 @@ func (m *BitmapIndex) PartitionInfo(ctx context.Context,
 		if req.Index != "" && p.Index != req.Index {
 			return nil
 		}
+		if p.TQType == "" {
+			return nil
+		}
         bitmap := p.Shard.(*StandardBitmap)
 		r := &pb.PartitionInfoResult{Time: p.Time.UnixNano(), Index: p.Index, Field: p.Field,
 			RowIdOrValue: p.RowIDOrBits, ModTime: bitmap.ModTime.UnixNano(), TqType: p.TQType}

server/kvstore.go

@@ -475,26 +475,46 @@ func (m *KVStore) DeleteIndicesWithPrefix(ctx context.Context,
 	if req.Prefix == "" {
 		return &empty.Empty{}, fmt.Errorf("Index prefix must be specified")
 	}
+
+	u.Infof("Deleting index files for prefix %v, retain enums = %v", req.Prefix, req.RetainEnums)
+
+	// Interate over storeCache and close everything currently open for this prefix
 	m.storeCacheLock.Lock()
-	defer m.storeCacheLock.Unlock()
 	for k, v := range m.storeCache {
-		if strings.HasPrefix(k, req.Prefix) {
+		if strings.HasPrefix(k, req.Prefix + sep) {
 			v.db.Sync()
 			v.db.Close()
 			delete(m.storeCache, k)
-			if req.RetainEnums && strings.HasSuffix(k, "StringEnum") {
-				u.Infof("Sync and close [%s]", k)
-				continue
-			}
-			if err := os.RemoveAll(m.Node.dataDir + sep + "index" + sep + k); err != nil {
-				return &empty.Empty{}, fmt.Errorf("DeleteIndicesWithPrefix error [%v]", err)
-			}
-			u.Infof("Sync, close, and delete [%s]", k)
+			u.Infof("Sync and close [%s]", k)
 		}
 	}
-	if !req.RetainEnums {
-		if err := os.RemoveAll(m.Node.dataDir + sep + "index" + sep + req.Prefix); err != nil {
-			return &empty.Empty{}, fmt.Errorf("DeleteIndicesWithPrefix error [%v]", err)
+	m.storeCacheLock.Unlock()
+
+	// retrieve list of indices matching the prefix from the filesystem
+	baseDir := m.Node.dataDir + sep + "index" + sep + req.Prefix
+	files, err := os.ReadDir(baseDir)
+	if err != nil {
+		return &empty.Empty{}, fmt.Errorf("DeleteIndicesWithPrefix: %v", err)
+	}
+	for _, file := range files {
+		if !file.IsDir() {
+			continue
+		}
+		k := baseDir + sep + file.Name()
+		if !req.RetainEnums {
+			if err := os.RemoveAll(baseDir); err != nil {
+				return &empty.Empty{}, fmt.Errorf("DeleteIndicesWithPrefix retain is false: error [%v]", err)
+			} else {
+				u.Infof("Deleted [%s]", k)
+			}
+		} else {
+			if !strings.HasSuffix(k, "StringEnum") {
+				if err := os.RemoveAll(k); err != nil {
+					return &empty.Empty{}, fmt.Errorf("DeleteIndicesWithPrefix retain is true:error [%v]", err)
+				} else {
+					u.Infof("Deleted [%s]", k)
+				}
+			}
 		}
 	}
 	return &empty.Empty{}, nil

test-integration/sqlrunner_test.go

@@ -88,7 +88,7 @@ func TestMutate(t *testing.T) {
 	// ensure we have a cluster on localhost, start one if necessary
 	state := test.Ensure_cluster(3)
 
-	fmt.Println("TestBasic")
+	fmt.Println("TestMutate")
 	currentDir, err := os.Getwd()
 	check(err)
 	err = os.Chdir("../sqlrunner") // these run from the sqlrunner/ directory

version.txt

@@ -1,2 +1,2 @@
-quanta 0.9.14-rc-2
+quanta 0.9.14-rc-3