Merge pull request #29 from takashabe/fix-options

Use ChainFilters if multiple ReadOption
takashabe · Sep 17, 2018 · 457be34 · 457be34
2 parents 10cac97 + 0aa161d
commit 457be34
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 31 deletions.
diff --git a/api/infrastructure/bigtable/bigtable_test.go b/api/infrastructure/bigtable/bigtable_test.go
@@ -117,22 +117,16 @@ func TestGetRows(t *testing.T) {
 		},
 		{
 			"users",
-			bigtable.NewRange("3", ""),
+			bigtable.PrefixRange("4"),
 			[]bigtable.ReadOption{
-				bigtable.RowFilter(bigtable.LatestNFilter(1)),
+				bigtable.RowFilter(
+					bigtable.ChainFilters(
+						bigtable.FamilyFilter("^d$"),
+						bigtable.LatestNFilter(1),
+					),
+				),
 			},
 			[]*domain.Row{
-				&domain.Row{
-					Key: "3",
-					Columns: []*domain.Column{
-						&domain.Column{
-							Family:    "d",
-							Qualifier: "d:row",
-							Value:     []byte("sayaka"),
-							Version:   tm,
-						},
-					},
-				},
 				&domain.Row{
 					Key: "4",
 					Columns: []*domain.Column{

diff --git a/api/interfaces/executor.go b/api/interfaces/executor.go
@@ -239,30 +239,40 @@ func rowRange(parsedArgs map[string]string) (bigtable.RowRange, error) {
 }
 
 func readOption(parsedArgs map[string]string) ([]bigtable.ReadOption, error) {
-	var opts []bigtable.ReadOption
-	if count := parsedArgs["count"]; count != "" {
-		n, err := strconv.ParseInt(count, 0, 64)
-		if err != nil {
-			return nil, err
-		}
-		opts = append(opts, bigtable.LimitRows(n))
-	}
+	var (
+		opts []bigtable.ReadOption
+		fils []bigtable.Filter
+	)
+
+	// filters
 	if regex := parsedArgs["regex"]; regex != "" {
-		opts = append(opts, bigtable.RowFilter(bigtable.RowKeyFilter(regex)))
+		// opts = append(opts, bigtable.RowFilter(bigtable.RowKeyFilter(regex)))
+		fils = append(fils, bigtable.RowKeyFilter(regex))
+	}
+	if family := parsedArgs["family"]; family != "" {
+		// opts = append(opts, bigtable.RowFilter(bigtable.FamilyFilter(fmt.Sprintf("^%s$", family))))
+		fils = append(fils, bigtable.FamilyFilter(fmt.Sprintf("^%s$", family)))
 	}
 	if version := parsedArgs["version"]; version != "" {
 		n, err := strconv.ParseInt(version, 0, 64)
 		if err != nil {
 			return nil, err
 		}
-		opts = append(opts, bigtable.RowFilter(bigtable.LatestNFilter(int(n))))
+		// opts = append(opts, bigtable.RowFilter(bigtable.LatestNFilter(int(n))))
+		fils = append(fils, bigtable.LatestNFilter(int(n)))
 	}
-	if family := parsedArgs["family"]; family != "" {
-		opts = append(opts, bigtable.RowFilter(bigtable.FamilyFilter(fmt.Sprintf("^%s$", family))))
+	if len(fils) > 0 {
+		opts = append(opts, bigtable.RowFilter(bigtable.ChainFilters(fils...)))
 	}
 
-	// TODO: Add read options. refs hbase-shell
-
+	// isolated readOption
+	if count := parsedArgs["count"]; count != "" {
+		n, err := strconv.ParseInt(count, 0, 64)
+		if err != nil {
+			return nil, err
+		}
+		opts = append(opts, bigtable.LimitRows(n))
+	}
 	return opts, nil
 }
 

diff --git a/api/interfaces/executor_test.go b/api/interfaces/executor_test.go
@@ -58,16 +58,16 @@ func TestReadOption(t *testing.T) {
 				"regex": "a",
 			},
 			[]bigtable.ReadOption{
+				chainFilters(bigtable.RowKeyFilter("a")),
 				bigtable.LimitRows(1),
-				bigtable.RowFilter(bigtable.RowKeyFilter("a")),
 			},
 		},
 		{
 			map[string]string{
 				"family": "d",
 			},
 			[]bigtable.ReadOption{
-				bigtable.RowFilter(bigtable.FamilyFilter("^d$")),
+				chainFilters(bigtable.FamilyFilter("^d$")),
 			},
 		},
 	}
@@ -99,7 +99,12 @@ func TestDoReadRowExecutor(t *testing.T) {
 			"lookup table a version=1 decode=int decode_columns=row:string,404:float",
 			"----------------------------------------\na\n  d:row                                    @ 2018/01/01-00:00:00.000000\n    \"a1\"\n",
 			func(mock *repository.MockBigtable) {
-				mock.EXPECT().Get(gomock.Any(), "table", "a", bigtable.RowFilter(bigtable.LatestNFilter(1))).Return(
+				mock.EXPECT().Get(
+					gomock.Any(),
+					"table",
+					"a",
+					chainFilters(bigtable.LatestNFilter(1)),
+				).Return(
 					&domain.Bigtable{
 						Table: "table",
 						Rows: []*domain.Row{
@@ -122,7 +127,43 @@ func TestDoReadRowExecutor(t *testing.T) {
 			"read table prefix=a version=1 decode=int decode_columns=row:string,404:float",
 			"----------------------------------------\na\n  d:row                                    @ 2018/01/01-00:00:00.000000\n    \"a1\"\n",
 			func(mock *repository.MockBigtable) {
-				mock.EXPECT().GetRows(gomock.Any(), "table", bigtable.PrefixRange("a"), bigtable.RowFilter(bigtable.LatestNFilter(1))).Return(
+				mock.EXPECT().GetRows(
+					gomock.Any(),
+					"table",
+					bigtable.PrefixRange("a"),
+					chainFilters(bigtable.LatestNFilter(1)),
+				).Return(
+					&domain.Bigtable{
+						Table: "table",
+						Rows: []*domain.Row{
+							&domain.Row{
+								Key: "a",
+								Columns: []*domain.Column{
+									&domain.Column{
+										Family:    "d",
+										Qualifier: "d:row",
+										Value:     []byte("a1"),
+										Version:   tm,
+									},
+								},
+							},
+						},
+					}, nil).Times(1)
+			},
+		},
+		{
+			"read table version=1 family=d",
+			"----------------------------------------\na\n  d:row                                    @ 2018/01/01-00:00:00.000000\n    \"a1\"\n",
+			func(mock *repository.MockBigtable) {
+				mock.EXPECT().GetRows(
+					gomock.Any(),
+					"table",
+					bigtable.RowRange{},
+					chainFilters(
+						bigtable.FamilyFilter("^d$"),
+						bigtable.LatestNFilter(1),
+					),
+				).Return(
 					&domain.Bigtable{
 						Table: "table",
 						Rows: []*domain.Row{

diff --git a/api/interfaces/main_test.go b/api/interfaces/main_test.go
@@ -3,8 +3,14 @@ package interfaces
 import (
 	"os"
 	"testing"
+
+	"cloud.google.com/go/bigtable"
 )
 
 func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
+
+func chainFilters(filters ...bigtable.Filter) bigtable.ReadOption {
+	return bigtable.RowFilter(bigtable.ChainFilters(filters...))
+}