Skip to content

P
physical
Commit dfc7b221 authored by 段英荣's avatar 段英荣
Browse files
Options

modify celery

parent 027eb7bd
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 21 deletions
trans2es/type_info.py
View file @ dfc7b221
...@@ -144,6 +144,24 @@ class TypeInfo(object): ...@@ -144,6 +144,24 @@ class TypeInfo(object):
else: else:
if data: if data:
if self.type == "topic": if self.type == "topic":
# q = {
# "query":{
# "term":{
# "id": data["id"]
# }
# },
# "_source":{
# "include":["content_level"]
# }
# }
# search_results = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="topic-star",query_body=q,offset=0,size=1)
# if len(search_results["hits"]) > 0:
# ori_topic_star = search_results["hits"][0]["_source"]["content_level"]
# else:
ori_topic_star = redis_client.hget(self.physical_topic_star, data["id"])
if ori_topic_star:
ori_topic_star = str(ori_topic_star, encoding="utf-8")
else:
q = { q = {
"query":{ "query":{
"term":{ "term":{
...@@ -151,26 +169,22 @@ class TypeInfo(object): ...@@ -151,26 +169,22 @@ class TypeInfo(object):
} }
}, },
"_source":{ "_source":{
"include":["content_level"] "includes":["content_level"]
} }
} }
search_results = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="topic-star",query_body=q,offset=0,size=1) search_results = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="topic-star",query_body=q,offset=0,size=1)
if len(search_results["hits"]) > 0: if len(search_results["hits"]) > 0:
ori_topic_star = search_results["hits"][0]["_source"]["content_level"] ori_topic_star = search_results["hits"][0]["_source"]["content_level"]
else:
ori_topic_star = redis_client.hget(self.physical_topic_star, data["id"])
if ori_topic_star:
ori_topic_star = str(ori_topic_star, encoding="utf-8")
if not ori_topic_star: if not ori_topic_star:
data_list = [ # data_list = [
{ # {
"id": data["id"], # "id": data["id"],
"content_level": data["content_level"] # "content_level": data["content_level"]
} # }
] # ]
ESPerform.es_helpers_bulk(ESPerform.get_cli(), data_list, "topic-star") # ESPerform.es_helpers_bulk(ESPerform.get_cli(), data_list, "topic-star")
# redis_client.hset(self.physical_topic_star, data["id"], data["content_level"]) redis_client.hset(self.physical_topic_star, data["id"], data["content_level"])
else: else:
# int_ori_topic_star = int(str(ori_topic_star, encoding="utf-8")) # int_ori_topic_star = int(str(ori_topic_star, encoding="utf-8"))
int_ori_topic_star = int(ori_topic_star) int_ori_topic_star = int(ori_topic_star)
...@@ -184,14 +198,14 @@ class TypeInfo(object): ...@@ -184,14 +198,14 @@ class TypeInfo(object):
data_list.append(old_data) data_list.append(old_data)
if int_ori_topic_star>=4: if int_ori_topic_star>=4:
topic_data_high_star_list.append(old_data) topic_data_high_star_list.append(old_data)
# redis_client.hset(self.physical_topic_star, data["id"], data["content_level"]) redis_client.hset(self.physical_topic_star, data["id"], data["content_level"])
data_list = [ # data_list = [
{ # {
"id": data["id"], # "id": data["id"],
"content_level": data["content_level"] # "content_level": data["content_level"]
} # }
] # ]
ESPerform.es_helpers_bulk(ESPerform.get_cli(), data_list, "topic-star") # ESPerform.es_helpers_bulk(ESPerform.get_cli(), data_list, "topic-star")
if data["content_level"] and int(data["content_level"])>=4: if data["content_level"] and int(data["content_level"])>=4:
......
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