解决冲突
This commit is contained in:
@@ -157,15 +157,9 @@ def findHouse(query, fields=None):
|
|||||||
seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777)
|
seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777)
|
||||||
for err_count in range(0, 10):
|
for err_count in range(0, 10):
|
||||||
try:
|
try:
|
||||||
<<<<<<< HEAD
|
|
||||||
lt = 100
|
lt = 100
|
||||||
# seawater.find(query,{"p_date":-1}).sort([("p_date",-1)])
|
# seawater.find(query,{"p_date":-1}).sort([("p_date",-1)])
|
||||||
pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt))
|
pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt))
|
||||||
#pos = list(seawater105.find(query, fields).limit(lt))
|
|
||||||
=======
|
|
||||||
lt = 1000
|
|
||||||
pos = list(seawater105.find(query, fields).limit(lt))
|
|
||||||
>>>>>>> 9b39a072aff955aeed773a2c859e1d355ec52231
|
|
||||||
data = pandas.DataFrame(pos)
|
data = pandas.DataFrame(pos)
|
||||||
del pos
|
del pos
|
||||||
# print("==================>", time.time() - s)
|
# print("==================>", time.time() - s)
|
||||||
|
|||||||
Reference in New Issue
Block a user