Make it possible to use wildcards to get field names (#87)

* Make it possible to use wildcards to get field names

* Change sleep time to 3 seconds

Author: mosuka

metastore_integration_test/storage_dynamodb_test.go

@@ -231,7 +231,7 @@ func TestDynamodbStorageStorageEvents(t *testing.T) {
 	// dynamodbStorage.Put("/world.txt", []byte("world"))
 
 	// wait for events to be processed
-	time.Sleep(1 * time.Second)
+	time.Sleep(3 * time.Second)
 	done2 <- true
 
 	actual := len(eventList)

metastore_integration_test/storage_etcd_test.go

@@ -220,7 +220,7 @@ func TestEtcdStorageEvents(t *testing.T) {
 	etcdStorage.Put("/world.txt", []byte("world"))
 
 	// wait for events to be processed
-	time.Sleep(1 * time.Second)
+	time.Sleep(3 * time.Second)
 
 	done <- true
 

metastore_test/storage_fs_test.go

@@ -244,7 +244,7 @@ func TestFileSystemStorageEvents(t *testing.T) {
 	fsMetastore.Put("/hello2.txt", []byte("hello2"))
 
 	// wait for events to be processed
-	time.Sleep(1 * time.Second)
+	time.Sleep(3 * time.Second)
 
 	done <- true
 

server/index_service.go

@@ -25,6 +25,7 @@ import (
 	"github.com/mosuka/phalanx/proto"
 	phalanxaggregations "github.com/mosuka/phalanx/search/aggregations"
 	phalanxqueries "github.com/mosuka/phalanx/search/queries"
+	"github.com/mosuka/phalanx/util/wildcard"
 	"github.com/thanhpk/randstr"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
@@ -1207,8 +1208,8 @@ func (s *IndexService) Search(req *proto.SearchRequest) (*proto.SearchResponse,
 								doc.Timestamp = timestamp.UTC().UnixNano()
 							default:
 								exists := false
-								for _, fieldName := range request.Fields {
-									if fieldName == field {
+								for _, reqField := range request.Fields {
+									if wildcard.Match(reqField, field) {
 										exists = true
 										break
 									}

server/marshaler.go

@@ -218,9 +218,6 @@ func (m *Marshaler) Unmarshal(data []byte, v interface{}) error {
 			value.IndexName = indexName
 		}
 
-		// if query, ok := m["query"].(string); ok {
-		// 	value.Query = query
-		// }
 		if query, ok := m["query"].(map[string]interface{}); ok {
 			queryType, ok := query["type"].(string)
 			if !ok {

util/wildcard/wildcard.go

@@ -0,0 +1,33 @@
+package wildcard
+
+import (
+	"regexp"
+	"strings"
+)
+
+var wildcardRegexpReplacer = strings.NewReplacer(
+	// characters in the wildcard that must
+	// be escaped in the regexp
+	"+", `\+`,
+	"(", `\(`,
+	")", `\)`,
+	"^", `\^`,
+	"$", `\$`,
+	".", `\.`,
+	"{", `\{`,
+	"}", `\}`,
+	"[", `\[`,
+	"]", `\]`,
+	`|`, `\|`,
+	`\`, `\\`,
+	// wildcard characters
+	"*", ".*",
+	"?", ".")
+
+func Match(pattern, text string) bool {
+	regexpString := wildcardRegexpReplacer.Replace(pattern)
+
+	regexpObj := regexp.MustCompile(regexpString)
+
+	return regexpObj.MatchString(text)
+}

util/wildcard/wildcard_test.go

@@ -0,0 +1,61 @@
+package wildcard
+
+import (
+	"testing"
+)
+
+func TestMatch(t *testing.T) {
+	actual := Match("*", "hoge")
+	expected := true
+	if actual != expected {
+		t.Fatalf("expected %v, but %v\n", expected, actual)
+	}
+}
+
+func TestMatchSuffix(t *testing.T) {
+	actual := Match("*oge", "hoge")
+	expected := true
+	if actual != expected {
+		t.Fatalf("expected %v, but %v\n", expected, actual)
+	}
+}
+
+func TestMatchSuffixUnmatch(t *testing.T) {
+	actual := Match("*age", "hoge")
+	expected := false
+	if actual != expected {
+		t.Fatalf("expected %v, but %v\n", expected, actual)
+	}
+}
+
+func TestMatchPrefix(t *testing.T) {
+	actual := Match("ho*", "hoge")
+	expected := true
+	if actual != expected {
+		t.Fatalf("expected %v, but %v\n", expected, actual)
+	}
+}
+
+func TestMatchPrefixUnmatch(t *testing.T) {
+	actual := Match("hu*", "hoge")
+	expected := false
+	if actual != expected {
+		t.Fatalf("expected %v, but %v\n", expected, actual)
+	}
+}
+
+func TestMatchExact(t *testing.T) {
+	actual := Match("hoge", "hoge")
+	expected := true
+	if actual != expected {
+		t.Fatalf("expected %v, but %v\n", expected, actual)
+	}
+}
+
+func TestMatchExactUnmatch(t *testing.T) {
+	actual := Match("huge", "hoge")
+	expected := false
+	if actual != expected {
+		t.Fatalf("expected %v, but %v\n", expected, actual)
+	}
+}