Merge pull request #32 from takashabe/fix-chain-filter

Fix ChainFilter when only one filter is used
takashabe · Nov 6, 2018 · dfd80d3 · dfd80d3
2 parents c8a51d9 + 481fb1e
commit dfd80d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/api/interfaces/executor.go b/api/interfaces/executor.go
@@ -209,7 +209,7 @@ func (e *Executor) readWithOptions(table string, args ...string) {
 	ctx := context.Background()
 	rows, err := e.rowsInteractor.GetRows(ctx, table, rr, ro...)
 	if err != nil {
-		fmt.Fprintf(e.errStream, "%v", err)
+		fmt.Fprintf(e.errStream, "%v\n", err)
 		return
 	}
 
@@ -261,7 +261,10 @@ func readOption(parsedArgs map[string]string) ([]bigtable.ReadOption, error) {
 		// opts = append(opts, bigtable.RowFilter(bigtable.LatestNFilter(int(n))))
 		fils = append(fils, bigtable.LatestNFilter(int(n)))
 	}
-	if len(fils) > 0 {
+
+	if len(fils) == 1 {
+		opts = append(opts, bigtable.RowFilter(fils[0]))
+	} else if len(fils) > 1 {
 		opts = append(opts, bigtable.RowFilter(bigtable.ChainFilters(fils...)))
 	}
 

diff --git a/api/interfaces/executor_test.go b/api/interfaces/executor_test.go
@@ -58,7 +58,7 @@ func TestReadOption(t *testing.T) {
 				"regex": "a",
 			},
 			[]bigtable.ReadOption{
-				chainFilters(bigtable.RowKeyFilter("a")),
+				bigtable.RowFilter(bigtable.RowKeyFilter("a")),
 				bigtable.LimitRows(1),
 			},
 		},
@@ -67,7 +67,7 @@ func TestReadOption(t *testing.T) {
 				"family": "d",
 			},
 			[]bigtable.ReadOption{
-				chainFilters(bigtable.FamilyFilter("^d$")),
+				bigtable.RowFilter(bigtable.FamilyFilter("^d$")),
 			},
 		},
 	}
@@ -103,7 +103,7 @@ func TestDoReadRowExecutor(t *testing.T) {
 					gomock.Any(),
 					"table",
 					"a",
-					chainFilters(bigtable.LatestNFilter(1)),
+					bigtable.RowFilter(bigtable.LatestNFilter(1)),
 				).Return(
 					&domain.Bigtable{
 						Table: "table",
@@ -131,7 +131,7 @@ func TestDoReadRowExecutor(t *testing.T) {
 					gomock.Any(),
 					"table",
 					bigtable.PrefixRange("a"),
-					chainFilters(bigtable.LatestNFilter(1)),
+					bigtable.RowFilter(bigtable.LatestNFilter(1)),
 				).Return(
 					&domain.Bigtable{
 						Table: "table",