Review feedback.

Signed-off-by: Tom Wilkie <[email protected]>

Author: tomwilkie

pkg/chunk/schema_config.go

@@ -60,7 +60,7 @@ func (cfg *SchemaConfig) RegisterFlags(f *flag.FlagSet) {
 	f.Var(&cfg.V6SchemaFrom, "dynamodb.v6-schema-from", "The date (in the format YYYY-MM-DD) after which we enable v6 schema.")
 	f.Var(&cfg.V7SchemaFrom, "dynamodb.v7-schema-from", "The date (in the format YYYY-MM-DD) after which we enable v7 schema (Deprecated).")
 	f.Var(&cfg.V8SchemaFrom, "dynamodb.v8-schema-from", "The date (in the format YYYY-MM-DD) after which we enable v8 schema (Deprecated).")
-	f.Var(&cfg.V9SchemaFrom, "dynamodb.v9-schema-from", "The data (in the format YYYY-MM-DD) after which we enable v9 schema (Series indexing).")
+	f.Var(&cfg.V9SchemaFrom, "dynamodb.v9-schema-from", "The date (in the format YYYY-MM-DD) after which we enable v9 schema (Series indexing).")
 
 	f.BoolVar(&cfg.ThroughputUpdatesDisabled, "table-manager.throughput-updates-disabled", false, "If true, disable all changes to DB capacity")
 	f.DurationVar(&cfg.DynamoDBPollInterval, "dynamodb.poll-interval", 2*time.Minute, "How frequently to poll DynamoDB to learn our capacity.")

pkg/chunk/series_store.go

@@ -79,13 +79,6 @@ func (c *seriesStore) Get(ctx context.Context, from, through model.Time, allMatc
 	}
 	level.Debug(log).Log("Chunk IDs", len(chunkIDs))
 
-	// Protect ourselves against OOMing.
-	if len(chunkIDs) > c.cfg.QueryChunkLimit {
-		err := fmt.Errorf("Query %v fetched too many chunks (%d > %d)", allMatchers, len(chunkIDs), c.cfg.QueryChunkLimit)
-		level.Error(log).Log("err", err)
-		return nil, err
-	}
-
 	// Filter out chunks that are not in the selected time range.
 	chunks, err := c.convertChunkIDsToChunks(ctx, chunkIDs)
 	if err != nil {
@@ -94,6 +87,13 @@ func (c *seriesStore) Get(ctx context.Context, from, through model.Time, allMatc
 	filtered, keys := filterChunksByTime(from, through, chunks)
 	level.Debug(log).Log("Chunks post filtering", len(chunks))
 
+	// Protect ourselves against OOMing.
+	if len(chunkIDs) > c.cfg.QueryChunkLimit {
+		err := fmt.Errorf("Query %v fetched too many chunks (%d > %d)", allMatchers, len(chunkIDs), c.cfg.QueryChunkLimit)
+		level.Error(log).Log("err", err)
+		return nil, err
+	}
+
 	// Now fetch the actual chunk data from Memcache / S3
 	allChunks, err := c.fetchChunks(ctx, filtered, keys)
 	if err != nil {