Fix some cases

Author: neurlang

v1/api_test.go

@@ -175,6 +175,99 @@ func TestInsertBooleans(t *testing.T) {
 		}
 	}
 }
+func TestInsertIntegersActive(t *testing.T) {
+	{
+		m := map[string]uint64{
+			"active":   1,
+			"inactive": 0,
+		}
+		b := Make(m, 1)
+		for k, v := range m {
+			valb := GetBool(b, k)
+			if (v != 0) != valb {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", valb, k, v)
+			}
+			val := uint64(GetNum(b, 1, k))
+			if v != val {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", val, k, v)
+			}
+
+		}
+	}
+	{
+		m := map[string]uint64{
+			"S0t6lRZL": 1,
+			"kSix4YCB": 0,
+		}
+		b := Make(m, 1)
+		for k, v := range m {
+			valb := GetBool(b, k)
+			if (v != 0) != valb {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", valb, k, v)
+			}
+			val := uint64(GetNum(b, 1, k))
+			if v != val {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", val, k, v)
+			}
+
+		}
+	}
+	{
+		m := map[string]uint64{
+			"NDD63C2T": 1,
+			"yAVmNkB3": 0,
+		}
+		b := Make(m, 1)
+		for k, v := range m {
+			valb := GetBool(b, k)
+			if (v != 0) != valb {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", valb, k, v)
+			}
+			val := uint64(GetNum(b, 1, k))
+			if v != val {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", val, k, v)
+			}
+
+		}
+	}
+	{
+		m := map[string]uint64{
+			"MdR8DAqA": 0,
+			"hgPXP3o6": 1,
+		}
+		b := Make(m, 1)
+		for k, v := range m {
+			valb := GetBool(b, k)
+			if (v != 0) != valb {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", valb, k, v)
+			}
+			val := uint64(GetNum(b, 1, k))
+			if v != val {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", val, k, v)
+			}
+
+		}
+	}
+	{
+		m := map[string]uint64{
+			"S0t6lRZL": 0,
+			"lyBFeCmp": 1,
+		}
+		b := Make(m, 1)
+		for k, v := range m {
+			valb := GetBool(b, k)
+			if (v != 0) != valb {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", valb, k, v)
+			}
+			val := uint64(GetNum(b, 1, k))
+			if v != val {
+				t.Fatalf("Insert Integers Active returned %v for %s want %v", val, k, v)
+			}
+
+		}
+	}
+}
+
 func TestInsertIntegers(t *testing.T) {
 	{
 		m := map[string]uint8{

v1/create.go

@@ -45,7 +45,7 @@ func create(data map[string][]byte, bitLimit byte) (filter []byte) {
 	for {
 		var is_mutated = true
 		var load uint64
-		for is_mutated {
+		for is_mutated && load < maxLoad {
 			var new_inserted uint64
 		inner1:
 			for k, v := range data {

v1/load.go

@@ -12,15 +12,7 @@ func get(f []byte, data []byte, anslen uint64) (ret []byte) {
 		return nil
 	}
 	var datb [64]byte
-	if len(data) > 63 {
-		datb = sha512.Sum512(data)
-	} else {
-		copy(datb[:], data)
-		datb[63] = byte(len(data))
-		for i := range datb {
-			datb[(i+1)&63] ^= datb[i]
-		}
-	}
+	datb = sha512.Sum512(data)
 
 	baseSize := uint64(len(f))
 	bitLimit := f[len(f)-1]
@@ -52,8 +44,8 @@ func get(f []byte, data []byte, anslen uint64) (ret []byte) {
 
 	// Process rounds
 outer:
-	for roundx := uint32(0); roundx < ROUNDS; roundx++ {
-		for roundy := roundx + 1; roundy < ROUNDS; roundy++ {
+	for roundx := uint32(1); roundx < ROUNDS; roundx++ {
+		for roundy := uint32(0); roundy < roundx; roundy++ {
 			var allDone uint64
 			for i := range done {
 				for j := 0; j < 8; j++ {

v1/store.go

@@ -14,15 +14,7 @@ func store(fs []byte, data []byte, answer []byte, bitLimit byte) uint64 {
 	}
 
 	var datb [64]byte
-	if len(data) > 63 {
-		datb = sha512.Sum512(data)
-	} else {
-		copy(datb[:], data)
-		datb[63] = byte(len(data))
-		for i := range datb {
-			datb[(i+1)&63] ^= datb[i]
-		}
-	}
+	datb = sha512.Sum512(data)
 
 	baseSize := uint64(len(fs))
 	cells := cellSize(baseSize - 1)
@@ -42,14 +34,14 @@ func store(fs []byte, data []byte, answer []byte, bitLimit byte) uint64 {
 
 	// Track active filters and their insertion counts
 	active := make([]bool, storedBits, storedBits)
+	mutated := make([]bool, storedBits, storedBits)
 
-	var totalInserted uint64
 	//println(storedBits, cells, baseSize)
 
 	// Process rounds
 outer:
-	for roundx := uint32(0); roundx < ROUNDS; roundx++ {
-		for roundy := roundx + 1; roundy < ROUNDS; roundy++ {
+	for roundx := uint32(1); roundx < ROUNDS; roundx++ {
+		for roundy := uint32(0); roundy < roundx; roundy++ {
 			anyActive := false
 			x := binary.BigEndian.Uint32(datb[4*roundx:])
 			y := binary.BigEndian.Uint32(datb[4*roundy:])
@@ -75,22 +67,21 @@ outer:
 						active[i] = true
 					} else {
 						fs[pos] |= (bit + 1) << shift
-						totalInserted++
-						active[i] = true
+						mutated[i] = true
 					}
 				case 1:
 					if bit == 0 {
 						active[i] = true
 					} else {
 						fs[pos] |= 3 << shift
-						totalInserted++
+						mutated[i] = true
 					}
 				case 2:
 					if bit == 1 {
 						active[i] = true
 					} else {
 						fs[pos] |= 3 << shift
-						totalInserted++
+						mutated[i] = true
 					}
 				}
 			}
@@ -100,7 +91,12 @@ outer:
 			}
 		}
 	}
-
+	var totalInserted uint64
+	for i := uint64(0); i < storedBits; i++ {
+		if mutated[i] {
+			totalInserted++
+		}
+	}
 	// Finalize insertion counts
 	return totalInserted
 }