Fix field indexing

xichen2020 · Jan 28, 2019 · 1c68e44 · 1c68e44
1 parent 14b037a
commit 1c68e44
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/storage/immutable_segment.go b/storage/immutable_segment.go
@@ -218,10 +218,11 @@ func (s *immutableSeg) QueryRaw(
 		}
 	}()
 
-	if queryFields[rawDocSourceFieldIdx] == nil {
+	queryRawDocSourceFieldIdx := fieldIndexMap[rawDocSourceFieldIdx]
+	if queryFields[queryRawDocSourceFieldIdx] == nil {
 		return errNoRawDocSourceField
 	}
-	rawDocSourceField, ok := queryFields[rawDocSourceFieldIdx].StringField()
+	rawDocSourceField, ok := queryFields[queryRawDocSourceFieldIdx].StringField()
 	if !ok {
 		return errNoStringValuesInRawDocSourceField
 	}

diff --git a/storage/mutable_segment.go b/storage/mutable_segment.go
@@ -213,10 +213,11 @@ func (s *mutableSeg) QueryRaw(
 		return nil, nil
 	}
 
-	if queryFields[rawDocSourceFieldIdx] == nil {
+	queryRawDocSourceFieldIdx := fieldIndexMap[rawDocSourceFieldIdx]
+	if queryFields[queryRawDocSourceFieldIdx] == nil {
 		return nil, errNoRawDocSourceField
 	}
-	rawDocSourceField, ok := queryFields[rawDocSourceFieldIdx].StringField()
+	rawDocSourceField, ok := queryFields[queryRawDocSourceFieldIdx].StringField()
 	if !ok {
 		return nil, errNoStringValuesInRawDocSourceField
 	}

diff --git a/storage/segment_query.go b/storage/segment_query.go
@@ -55,8 +55,8 @@ func applyFilters(
 	queryFields []indexfield.DocsField,
 	numTotalDocs int32,
 ) (index.DocIDSetIterator, error) {
-	timestampFieldIdx := fieldIndexMap[timestampFieldIdx]
-	timestampField, exists := queryFields[timestampFieldIdx].TimeField()
+	queryTimestampFieldIdx := fieldIndexMap[timestampFieldIdx]
+	timestampField, exists := queryFields[queryTimestampFieldIdx].TimeField()
 	if !exists {
 		return nil, errNoTimeValuesInTimestampField
 	}