Commit cb572e8e authored by lixiaofang's avatar lixiaofang

update db_table;

parent 75021676
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="dbf86a46-510b-4304-905e-cf96c87ff27d" name="Default Changelist" comment=""> <list default="true" id="dbf86a46-510b-4304-905e-cf96c87ff27d" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app_conf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app_conf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/search/views/contrast_similar.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/views/contrast_similar.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/models/contrast_similar.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/models/contrast_similar.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/utils/contrast_similar_transfer.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/utils/contrast_similar_transfer.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -24,33 +30,33 @@ ...@@ -24,33 +30,33 @@
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="json" value="11" /> <entry key="json" value="11" />
<entry key="py" value="96" /> <entry key="py" value="116" />
<entry key="txt" value="1" /> <entry key="txt" value="1" />
<entry key="xml" value="2" /> <entry key="xml" value="4" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="JSON" value="11" /> <entry key="JSON" value="11" />
<entry key="PLAIN_TEXT" value="1" /> <entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="96" /> <entry key="Python" value="116" />
<entry key="XML" value="2" /> <entry key="XML" value="4" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="dummy" value="9" /> <entry key="dummy" value="9" />
<entry key="json" value="100" /> <entry key="json" value="100" />
<entry key="py" value="574" /> <entry key="py" value="653" />
<entry key="xml" value="17" /> <entry key="xml" value="21" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="JSON" value="100" /> <entry key="JSON" value="100" />
<entry key="PLAIN_TEXT" value="9" /> <entry key="PLAIN_TEXT" value="9" />
<entry key="Python" value="574" /> <entry key="Python" value="653" />
<entry key="XML" value="17" /> <entry key="XML" value="21" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
...@@ -58,30 +64,72 @@ ...@@ -58,30 +64,72 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py"> <entry file="file://$PROJECT_DIR$/physical/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="-978">
<caret line="13" column="29" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="29" /> <caret line="60" column="22" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
<folding>
<element signature="e#47#70#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search/views/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1036">
<caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
<folding>
<element signature="e#24#52#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/models/contrast_similar.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="13">
<caret line="33" column="12" lean-forward="true" selection-start-line="33" selection-start-column="12" selection-end-line="33" selection-end-column="12" /> <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="15" column="38" lean-forward="true" selection-start-line="15" selection-end-line="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/injection/data_sync/tasks.py"> <entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/base.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-165"> <state relative-caret-position="-3981">
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="14" /> <caret line="484" column="23" selection-start-line="484" selection-start-column="21" selection-end-line="484" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2072">
<caret line="320" selection-start-line="320" selection-end-line="320" />
<folding> <folding>
<element signature="e#25#55#0" expanded="true" /> <element signature="e#15#87#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -126,22 +174,22 @@ ...@@ -126,22 +174,22 @@
<option value="$PROJECT_DIR$/trans2es/mapping/contrast_similar.json" /> <option value="$PROJECT_DIR$/trans2es/mapping/contrast_similar.json" />
<option value="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar_three.py" /> <option value="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar_three.py" />
<option value="$PROJECT_DIR$/trans2es/management/commands/trans2es_mapping2es.py" /> <option value="$PROJECT_DIR$/trans2es/management/commands/trans2es_mapping2es.py" />
<option value="$PROJECT_DIR$/trans2es/utils/contrast_similar_transfer.py" />
<option value="$PROJECT_DIR$/trans2es/type_info.py" /> <option value="$PROJECT_DIR$/trans2es/type_info.py" />
<option value="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py" />
<option value="$PROJECT_DIR$/physical/settings.py" /> <option value="$PROJECT_DIR$/physical/settings.py" />
<option value="$PROJECT_DIR$/search/utils/user.py" /> <option value="$PROJECT_DIR$/search/utils/user.py" />
<option value="$PROJECT_DIR$/libs/es.py" /> <option value="$PROJECT_DIR$/libs/es.py" />
<option value="$PROJECT_DIR$/search/views/contrast_similar.py" /> <option value="$PROJECT_DIR$/trans2es/utils/contrast_similar_transfer.py" />
<option value="$PROJECT_DIR$/app_conf.xml" />
<option value="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py" /> <option value="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py" />
<option value="$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py" />
<option value="$PROJECT_DIR$/search/views/contrast_similar.py" />
<option value="$PROJECT_DIR$/trans2es/models/contrast_similar.py" /> <option value="$PROJECT_DIR$/trans2es/models/contrast_similar.py" />
<option value="$PROJECT_DIR$/app_conf.xml" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="-23" /> <option name="x" value="29" />
<option name="y" value="216" /> <option name="y" value="23" />
<option name="width" value="1280" /> <option name="width" value="1280" />
<option name="height" value="736" /> <option name="height" value="736" />
</component> </component>
...@@ -178,18 +226,43 @@ ...@@ -178,18 +226,43 @@
<path> <path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" /> <item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" /> <item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="libs" type="462c0819:PsiDirectoryNode" /> <item name="physical" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" /> <item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" /> <item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
<item name="migrations" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" /> <item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" /> <item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" /> <item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="trans2es" type="462c0819:PsiDirectoryNode" /> <item name="trans2es" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="trans2es" type="462c0819:PsiDirectoryNode" />
<item name="management" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" />
<item name="trans2es" type="462c0819:PsiDirectoryNode" />
<item name="management" type="462c0819:PsiDirectoryNode" />
<item name="commands" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="physical" type="b2602c69:ProjectViewProjectNode" /> <item name="physical" type="b2602c69:ProjectViewProjectNode" />
<item name="physical" type="462c0819:PsiDirectoryNode" /> <item name="physical" type="462c0819:PsiDirectoryNode" />
...@@ -242,9 +315,9 @@ ...@@ -242,9 +315,9 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-24" y="23" width="1280" height="736" extended-state="0" /> <frame x="29" y="23" width="1280" height="736" extended-state="0" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18268467" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20492454" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info id="DB Browser" order="3" weight="0.32962668" /> <window_info id="DB Browser" order="3" weight="0.32962668" />
...@@ -257,7 +330,7 @@ ...@@ -257,7 +330,7 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.017770598" /> <window_info anchor="bottom" id="Version Control" order="7" weight="0.017770598" />
<window_info anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.0" /> <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.47987118" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="11" /> <window_info anchor="bottom" id="Python Console" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
...@@ -311,12 +384,6 @@ ...@@ -311,12 +384,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/physical/wsgi.py"> <entry file="file://$PROJECT_DIR$/physical/wsgi.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -437,16 +504,6 @@ ...@@ -437,16 +504,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/search/views/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2240">
<caret line="174" selection-start-line="174" selection-end-line="174" />
<folding>
<element signature="e#47#119#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/utils/user.py"> <entry file="file://$PROJECT_DIR$/search/utils/user.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="180">
...@@ -454,16 +511,6 @@ ...@@ -454,16 +511,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/libs/es.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1280">
<caret line="207" selection-start-line="207" selection-end-line="207" />
<folding>
<element signature="e#46#55#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/__init__.py"> <entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-636"> <state relative-caret-position="-636">
...@@ -480,55 +527,6 @@ ...@@ -480,55 +527,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="17" column="19" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="304" column="42" selection-start-line="304" selection-start-column="42" selection-end-line="304" selection-end-column="42" />
<folding>
<element signature="e#15#87#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/table_scan.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2160">
<caret line="148" column="8" selection-start-line="148" selection-start-column="8" selection-end-line="148" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/utils/contrast_similar_transfer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="191">
<caret line="102" selection-start-line="102" selection-end-line="102" />
<folding>
<element signature="e#1486#3018#0" />
<element signature="e#3207#4010#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/celebrity.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/celebrity.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -568,7 +566,7 @@ ...@@ -568,7 +566,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/injection/data_sync/tasks.py"> <entry file="file://$PROJECT_DIR$/injection/data_sync/tasks.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-165"> <state relative-caret-position="195">
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="14" /> <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="14" />
<folding> <folding>
<element signature="e#25#55#0" expanded="true" /> <element signature="e#25#55#0" expanded="true" />
...@@ -576,24 +574,128 @@ ...@@ -576,24 +574,128 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/physical/settings.py"> <entry file="file://$PROJECT_DIR$/trans2es/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-421"> <state>
<caret line="133" column="36" selection-start-line="133" selection-end-line="134" /> <folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="107">
<caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
<folding>
<element signature="e#48#76#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/es.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="207" selection-start-line="207" selection-end-line="207" />
<folding>
<element signature="e#46#55#0" expanded="true" />
<element signature="e#269#7399#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/group.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/utils/contrast_similar_transfer.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="120">
<caret line="13" column="29" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="29" /> <caret line="8" column="38" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="38" />
<folding>
<element signature="e#46#60#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/table_scan.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4">
<caret line="132" lean-forward="true" selection-start-line="132" selection-end-line="132" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-782">
<caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/tag.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="101" column="22" lean-forward="true" selection-start-line="101" selection-start-column="22" selection-end-line="101" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2072">
<caret line="320" selection-start-line="320" selection-end-line="320" />
<folding>
<element signature="e#15#87#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/venv/lib/python3.6/site-packages/django/db/models/base.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3981">
<caret line="484" column="23" selection-start-line="484" selection-start-column="21" selection-end-line="484" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1036">
<caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
<folding>
<element signature="e#24#52#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
<folding>
<element signature="e#47#70#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/physical/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-978">
<caret line="60" column="22" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/contrast_similar.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/contrast_similar.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="13">
<caret line="33" column="12" lean-forward="true" selection-start-line="33" selection-start-column="12" selection-end-line="33" selection-end-column="12" /> <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="15" column="38" lean-forward="true" selection-start-line="15" selection-end-line="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -13,7 +13,11 @@ ...@@ -13,7 +13,11 @@
<element value="search.views.group"/> <element value="search.views.group"/>
<element value="search.views.user"/> <element value="search.views.user"/>
<element value="search.views.tag"/> <element value="search.views.tag"/>
<element value="search.views.contrast_similar"/> <!--<element value="search.views.contrast_similar"/>-->
<element value="injection.data_sync.tasks"/> <element value="injection.data_sync.tasks"/>
</config> </config>
</gm_rpcd_config> </gm_rpcd_config>
...@@ -104,12 +104,10 @@ class Command(BaseCommand): ...@@ -104,12 +104,10 @@ class Command(BaseCommand):
def __sync_data_by_type(self, type_name): def __sync_data_by_type(self, type_name):
try: try:
type_info = get_type_info_map()[type_name] type_info = get_type_info_map()[type_name]
logging.info("begin .........!:%s" % type_name)
query_set = type_info.queryset query_set = type_info.queryset
slicer = TableSlicer(queryset=query_set, chunk_size=type_info.bulk_insert_chunk_size) slicer = TableSlicer(queryset=query_set, chunk_size=type_info.bulk_insert_chunk_size)
logging.info("begin .........!:%s" % slicer)
for chunk in slicer.chunks(): for chunk in slicer.chunks():
job = Job( job = Job(
......
...@@ -9,16 +9,18 @@ from django.db import models ...@@ -9,16 +9,18 @@ from django.db import models
import datetime import datetime
from .topic import Topic from .topic import Topic
manager = lambda: models.Manager().db_manager(using='face')
# manager = lambda: models.Manager().db_manager(using='face')
class ContrastSimilar(models.Model): class ContrastSimilar(models.Model):
class Meta: class Meta:
# alisa = 'face'
app_label: 'face'
verbose_name = u"用户脸相似度表" verbose_name = u"用户脸相似度表"
db_table = "face_user_contrast_similar" db_table = "face_user_contrast_similar"
objects = manager() # objects = manager()
id = models.IntegerField(verbose_name="主键ID", primary_key=True) id = models.IntegerField(verbose_name="主键ID", primary_key=True)
is_online = models.BooleanField(verbose_name="是否上线") is_online = models.BooleanField(verbose_name="是否上线")
is_deleted = models.BooleanField(verbose_name="是否删除") is_deleted = models.BooleanField(verbose_name="是否删除")
......
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf import settings
from django.core.management.base import BaseCommand, CommandError
import traceback
import logging
from django.db import models from django.db import models
import datetime import datetime
......
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os
import sys
import logging import logging
import traceback import traceback
from libs.tools import tzlc from libs.tools import tzlc
import time
from trans2es.models.contrast_similar import ContrastSimilar from trans2es.models.contrast_similar import ContrastSimilar
......
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