Commit 0cc65b9a authored by 李小芳's avatar 李小芳

修改mapping

parent 7e8d5952
...@@ -56,7 +56,6 @@ class Command(BaseCommand): ...@@ -56,7 +56,6 @@ class Command(BaseCommand):
]): ]):
raise CommandError( raise CommandError(
'unknown type name, type must be one of [topic, tag, itemwiki, diary, service, doctor, user, _all],ItemWiki,newwiki') 'unknown type name, type must be one of [topic, tag, itemwiki, diary, service, doctor, user, _all],ItemWiki,newwiki')
if options['type'] in ['service', 'sku']: if options['type'] in ['service', 'sku']:
es = get_talos_es() es = get_talos_es()
else: else:
...@@ -115,8 +114,10 @@ class Command(BaseCommand): ...@@ -115,8 +114,10 @@ class Command(BaseCommand):
def work(self, es, index_prefix, doc_type, delete=False): def work(self, es, index_prefix, doc_type, delete=False):
# create index if not exits # create index if not exits
create_index(es=es, index_prefix=index_prefix, doc_type=doc_type) create_index(es=es, index_prefix=index_prefix, doc_type=doc_type)
m = load_mapping(doc_type=doc_type) m = load_mapping(doc_type=doc_type)
# reset doc_type for experiment index
if doc_type == "diary_norms_disable": if doc_type == "diary_norms_disable":
doc_type = "diary" doc_type = "diary"
if doc_type == "sku_norms_disable": if doc_type == "sku_norms_disable":
...@@ -125,6 +126,5 @@ class Command(BaseCommand): ...@@ -125,6 +126,5 @@ class Command(BaseCommand):
doc_type = "service" doc_type = "service"
if doc_type == "service_ngram": if doc_type == "service_ngram":
doc_type = "service" doc_type = "service"
print(put_mapping(es=es, index_prefix=index_prefix, doc_type=doc_type, print(put_mapping(es=es, index_prefix=index_prefix, doc_type=doc_type,
mapping=m, delete=delete)) mapping=m, delete=delete))
...@@ -40,7 +40,7 @@ def create_index(es, index_prefix, doc_type): ...@@ -40,7 +40,7 @@ def create_index(es, index_prefix, doc_type):
) )
if not cl.exists(index=index): if not cl.exists(index=index):
cl.create(index=index) cl.create(index=index)
init_alias(es, index_prefix, doc_type) init_alias(es, index_prefix, "_doc")
return True return True
else: else:
return False return False
...@@ -111,9 +111,7 @@ def put_mapping(es, index_prefix, doc_type, mapping, delete=False): ...@@ -111,9 +111,7 @@ def put_mapping(es, index_prefix, doc_type, mapping, delete=False):
import copy import copy
mapping_copy = copy.deepcopy(mapping) mapping_copy = copy.deepcopy(mapping)
mapping_copy = _mapping_modify(es, doc_type, mapping_copy) mapping_copy = _mapping_modify(es, doc_type, mapping_copy)
print(mapping_copy)
print(index)
print(doc_type)
return cl.put_mapping(index=index, doc_type=doc_type, body=mapping_copy) return cl.put_mapping(index=index, doc_type=doc_type, body=mapping_copy)
...@@ -154,7 +152,7 @@ def init_alias(es, index_prefix, doc_type): ...@@ -154,7 +152,7 @@ def init_alias(es, index_prefix, doc_type):
cl.update_aliases(body=content) cl.update_aliases(body=content)
def update_max_min(key, score): def update_max_min(key,score):
try: try:
redis_client = redis.StrictRedis.from_url(settings.DORIS_URL) redis_client = redis.StrictRedis.from_url(settings.DORIS_URL)
data_dcit = redis_client.hgetall(key) data_dcit = redis_client.hgetall(key)
...@@ -170,6 +168,6 @@ def update_max_min(key, score): ...@@ -170,6 +168,6 @@ def update_max_min(key, score):
data_dcit[b"min"] = score data_dcit[b"min"] = score
else: else:
data_dcit[b"min"] = score data_dcit[b"min"] = score
redis_client.hmset(key, data_dcit) redis_client.hmset(key,data_dcit)
except: except:
logging_exception() logging_exception()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment