fixup! api: reorganize directory layout

Author: timbray

README.md

@@ -212,15 +212,23 @@ structure, which could be bad UTF-8 or malformed JSON
 or leaf values which are not provided as arrays.
 
 As many Patterns as desired can be added to a Quamina
-instance. 
+instance. More than one pattern can be added with the
+same `X` identifier.
 
 The `AddPattern` call is single-threaded; if multiple
 threads call it, they will block and execute sequentially.
+```go
+func (q *Quamina) DeletePatterns(x X) error 
+```
+After calling this API, no list of matches from
+`AddPattern` will include the `X` value specified
+in the argument.
 
+The `error` return value is nil unless there was an
+internal failure of Quamina’s storage system.
 ```go
 func (q *Quamina) MatchesForEvent(event []byte) ([]X, error)
 ```
-
 The `error` return value is nil unless there was an
 error in the encoding of the Event.
 
@@ -231,9 +239,10 @@ A single Quamina instance is not thread-safe. But
 instances can share the underlying data structures
 in a safe way.
 
-```json
+```go
 func (q *Quamina) Copy() *Quamina
 ```
+
 This generates a copy of of the target instance 
 which may be used in parallel on another thread, 
 while sharing the underlying data structure. Many

core_matcher.go

@@ -115,7 +115,7 @@ func (m *coreMatcher) addPattern(x X, patternJSON string) error {
 }
 
 // DeletePattern not implemented by coreMatcher
-func (m *coreMatcher) deletePattern(_ X) error {
+func (m *coreMatcher) deletePatterns(_ X) error {
 	return errors.New("operation not supported")
 }
 

matcher.go

@@ -2,8 +2,7 @@ package quamina
 
 type matcher interface {
 	addPattern(x X, pat string) error
-	MatchesForJSONEvent(event []byte) ([]X, error)
 	matchesForFields(fields []Field) ([]X, error)
-	deletePattern(x X) error
+	deletePatterns(x X) error
 	IsNameUsed(label []byte) bool
 }

matcher_test.go

@@ -12,12 +12,13 @@ func TestMatcherInterface(t *testing.T) {
 	if err != nil {
 		t.Error("addPattern? " + err.Error())
 	}
-	err = m.deletePattern("x")
+	err = m.deletePatterns("x")
 	if err == nil {
 		t.Error("coreMatcher allowed Delete!?")
 	}
 	event := `{"x": [3, 1]}`
-	matches, _ := m.MatchesForJSONEvent([]byte(event))
+	fields, _ := newJSONFlattener().Flatten([]byte(event), m)
+	matches, _ := m.matchesForFields(fields)
 	if len(matches) != 1 || matches[0] != x {
 		t.Error("missed match")
 	}

pruner.go

@@ -152,14 +152,14 @@ func (m *prunerMatcher) disableRebuild() {
 // rebuildTrigger provides a way to control when rebuilds are
 // automatically triggered during standard operations.
 //
-// Currently an addPattern, deletePattern, or matchesForFields can
+// Currently an addPattern, deletePatterns, or matchesForFields can
 // trigger a rebuild.  When a rebuild is triggered, it's executed
 // synchronously: the the Add/Delete/Match method doesn't return until
 // the rebuild is complete.
 type rebuildTrigger interface {
 	// rebuild should return true to trigger a rebuild.
 	//
-	// This method is called by AddPatter,deletePattern, and
+	// This method is called by AddPatter,deletePatterns, and
 	// matchesForFields.  added is true when called by addPattern;
 	// false otherwise. These methods currently do not return
 	// until the rebuild is complete, so beware.
@@ -267,7 +267,7 @@ func (m *prunerMatcher) matchesForFields(fields []Field) ([]X, error) {
 
 // DeletePattern removes the pattern from the index and maybe rebuilds
 // the index.
-func (m *prunerMatcher) deletePattern(x X) error {
+func (m *prunerMatcher) deletePatterns(x X) error {
 	n, err := m.live.Delete(x)
 	if err == nil {
 		if 0 < n {

pruner_test.go

@@ -49,10 +49,10 @@ func TestBasic(t *testing.T) {
 
 	m.printStats()
 
-	if err := m.deletePattern(id); err != nil {
+	if err := m.deletePatterns(id); err != nil {
 		t.Fatal(err)
 	}
-	if err := m.deletePattern(id); err != nil {
+	if err := m.deletePatterns(id); err != nil {
 		t.Fatal(err)
 	}
 
@@ -102,7 +102,7 @@ func TestRebuildSome(t *testing.T) {
 
 	depopulate := func() {
 		for i := 0; i < n; i += 2 {
-			if err := m.deletePattern(i); err != nil {
+			if err := m.deletePatterns(i); err != nil {
 				t.Fatal(err)
 			}
 		}
@@ -186,7 +186,7 @@ func TestTriggerTooManyFilteredDenom(t *testing.T) {
 	if err := m.addPattern(1, `{"likes":["tacos"]}`); err != nil {
 		t.Fatal(err)
 	}
-	if err := m.deletePattern(1); err != nil {
+	if err := m.deletePatterns(1); err != nil {
 		t.Fatal(err)
 	}
 	_, err := m.MatchesForJSONEvent([]byte(`{"likes":"tacos"}`))
@@ -226,7 +226,7 @@ func TestTriggerRebuild(t *testing.T) {
 		}
 
 		if doomed(i) {
-			if err := m.deletePattern(i); err != nil {
+			if err := m.deletePatterns(i); err != nil {
 				t.Fatal(err)
 			}
 		}
@@ -305,7 +305,7 @@ func TestBadState(t *testing.T) {
 	if err := m.addPattern(1, `{"likes":["queso"]}`); err == nil {
 		t.Fatal("expected error")
 	}
-	if err := m.deletePattern(1); err == nil {
+	if err := m.deletePatterns(1); err == nil {
 		t.Fatal("expected error")
 	}
 	if err := m.rebuild(false); err == nil {
@@ -424,7 +424,7 @@ func TestMultiplePatternsWithSameId(t *testing.T) {
 		t.Fatal(s.Live)
 	}
 
-	if err := m.deletePattern(id); err != nil {
+	if err := m.deletePatterns(id); err != nil {
 		t.Fatal(err)
 	}
 

quamina.go

@@ -74,6 +74,9 @@ func (q *Quamina) Copy() *Quamina {
 func (q *Quamina) AddPattern(x X, patternJSON string) error {
 	return q.matcher.addPattern(x, patternJSON)
 }
+func (q *Quamina) DeletePatterns(x X) error {
+	return q.matcher.deletePatterns(x)
+}
 func (q *Quamina) MatchesForEvent(event []byte) ([]X, error) {
 	fields, err := q.flattener.Flatten(event, q.matcher)
 	if err != nil {

race_test.go

@@ -33,7 +33,7 @@ func testConcurrency(t *testing.T, m matcher) {
 
 	// depopulate := func() {
 	//      for i := 0; i < n; i += 2 {
-	//              if err := m.deletePattern(i); err != nil {
+	//              if err := m.deletePatterns(i); err != nil {
 	//                      t.Fatal(err)
 	//              }
 	//      }