Merge pull request #1561 from codysoyland/v1.0-backport-1547

Backport #1547
This commit is contained in:
Cody Soyland 2018-08-01 10:23:03 -05:00 committed by GitHub
commit 3fcf5f18cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View file

@ -248,8 +248,7 @@ func (h *Holder) limitedSchema() []*IndexInfo {
func (h *Holder) applySchema(schema *Schema) error {
// Create indexes that don't exist.
for _, index := range schema.Indexes {
opt := IndexOptions{}
idx, err := h.CreateIndexIfNotExists(index.Name, opt)
idx, err := h.CreateIndexIfNotExists(index.Name, index.Options)
if err != nil {
return errors.Wrap(err, "creating index")
}

View file

@ -457,8 +457,8 @@ func (s *Server) receiveMessage(m Message) error {
}
idx.setRemoteMaxShard(obj.Shard)
case *CreateIndexMessage:
opt := IndexOptions{}
_, err := s.holder.CreateIndex(obj.Index, opt)
opt := obj.Meta
_, err := s.holder.CreateIndex(obj.Index, *opt)
if err != nil {
return err
}