add_summary_index #379
Merged
add_summary_index #379
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shenzheng-1
force-pushed
the
add_summary_index
branch
from
d49901f
to
613bbee
Compare
JoinTyang
reviewed
Sep 11, 2024
| @@ -29,6 +30,10 @@ class RepoFileNameIndex(object): | |||
| }, | |||
| }, | |||
| }, | |||
| 'description': { | |||
| 'type': 'text', | |||
| 'analyzer': 'standard' | |||
JoinTyang
reviewed
Sep 12, 2024
| @@ -104,7 +104,7 @@ def thread_task(self, repos_queue): | |||
| repo_id = queue_data[0] | |||
| commit_id = queue_data[1] | |||
| try: | |||
| self.index_manager.update_library_filename_index(repo_id, commit_id, self.repo_filename_index, self.repo_status_filename_index) | |||
| self.index_manager.update_library_filename_index(repo_id, commit_id, self.repo_filename_index, self.repo_status_filename_index, 3600 * 24 * 365) | |||
| @@ -98,6 +103,8 @@ def _make_match_query(field, key_word, **kw): | |||
| } | |||
| } | |||
| }) | |||
| if need_index_description(repo_id, session, metadata_server_api): | |||
There was a problem hiding this comment.
这个判断是不是可以不加？否则每次全局查询都有查很多次数据库和metadata
JoinTyang
reviewed
Sep 12, 2024
| per_size = SEASEARCH_BULK_OPETATE_LIMIT | ||
| start = 0 | ||
| while True: | ||
| hits, total = self.query_data_by_paths(index_name, paths, start, per_size) |
| if interval: | ||
| last_update_time = datetime.now() - timedelta(seconds=interval) | ||
| last_update_time = timestamp_to_isoformat_timestr(last_update_time.timestamp()) | ||
| sql = f"SELECT `_id`, `_mtime`, `_description`, `_parent_dir`, `_name` FROM `{METADATA_TABLE.name}` WHERE `_mtime` >= '{last_update_time}'" |
added 19 commits
September 19, 2024 17:03
shenzheng-1
force-pushed
the
add_summary_index
branch
from
272023e
to
37605eb
Compare
JoinTyang
reviewed
Sep 19, 2024
|
|
||
| need_added_files = added_files + modified_files | ||
| self.add_files(index_name, repo_id, need_added_files) | ||
| update_paths = [] | ||
| add_rows = {} |
|
|
||
| if new_commit_id == from_commit: | ||
| return | ||
| description_updated_time = repo_status.description_updated_time |
| if need_index_description(repo_id, self.session, self.metadata_server_api): | ||
| if description_updated_time: | ||
| last_update_time = timestamp_to_isoformat_timestr(float(description_updated_time)) | ||
| sql = f"SELECT `_id`, `_mtime`, `_description`, `_parent_dir`, `_name`, `_obj_id` FROM `{METADATA_TABLE.name}` WHERE `_is_dir` = False AND `_mtime` >= '{last_update_time}'" |
There was a problem hiding this comment.
这里改成分页查询，因为有的资料库文件可能会比较多
| else: | ||
| sql = f"SELECT `_id`, `_mtime`, `_description`, `_parent_dir`, `_name`, `_obj_id` FROM `{METADATA_TABLE.name}` WHERE `_is_dir` = False" | ||
| query_timestamp = time.time() | ||
| rows = self.metadata_server_api.query_rows(repo_id, sql, []).get('results', []) |
There was a problem hiding this comment.
这里加下判断 rows 为空并且commit没有变化就return
JoinTyang
reviewed
Sep 20, 2024
| @@ -213,6 +217,7 @@ def add_files(self, index_name, repo_id, files): | |||
| 'path': path, | |||
| 'suffix': suffix, | |||
| 'filename': filename, | |||
| 'description': rows.get(obj_id, ''), | |||
There was a problem hiding this comment.
不能通过obj_id 获取description，因为新建的文件obj_id都是一样的
| description_updated_time = datetime(1970, 1, 1).timestamp() | ||
| last_update_time = timestamp_to_isoformat_timestr(float(description_updated_time)) | ||
| sql = f"SELECT `_id`, `_mtime`, `_description`, `_parent_dir`, `_name`, `_obj_id` FROM `{METADATA_TABLE.name}` WHERE `_is_dir` = False AND `_mtime` >= '{last_update_time}'" | ||
| query_timestamp = time.time() |
There was a problem hiding this comment.
query_timestamp 这个放到每次启动这个定时任务时获取，否则会错过一些索引更新期间添加的description
JoinTyang
force-pushed
the
add_summary_index
branch
from
91ff1ae
to
452bf35
Compare
JoinTyang
force-pushed
the
add_summary_index
branch
from
452bf35
to
ac32b77
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.