From c936c603ca9e17591fe79936ca9714d5c05d78b2 Mon Sep 17 00:00:00 2001
From: mtrela <mtrela@syncad.com>
Date: Thu, 10 Sep 2020 10:45:50 +0200
Subject: [PATCH] Refactoring + `list_votes` sql function changed into
`list_votes_by_voter_comment`/`list_votes_by_comment_voter`
---
hive/db/db_state.py | 4 +-
hive/db/schema.py | 178 ++++++++++++++++-----------
hive/server/bridge_api/methods.py | 10 +-
hive/server/bridge_api/objects.py | 4 +-
hive/server/bridge_api/thread.py | 6 +-
hive/server/condenser_api/methods.py | 12 +-
hive/server/condenser_api/objects.py | 6 +-
hive/server/database_api/methods.py | 18 ++-
hive/server/tags_api/methods.py | 2 +-
9 files changed, 140 insertions(+), 100 deletions(-)
diff --git a/hive/db/db_state.py b/hive/db/db_state.py
index 1d3d56937..7c698c656 100644
--- a/hive/db/db_state.py
+++ b/hive/db/db_state.py
@@ -114,8 +114,8 @@ class DbState:
'hive_post_tags_tag_id_idx',
- 'hive_votes_voter_id_permlink_id_idx',
- 'hive_votes_permlink_id_voter_id_idx'
+ 'hive_votes_voter_id_post_id_idx',
+ 'hive_votes_post_id_voter_id_idx'
]
to_return = []
diff --git a/hive/db/schema.py b/hive/db/schema.py
index 302c788ee..205c7f8a9 100644
--- a/hive/db/schema.py
+++ b/hive/db/schema.py
@@ -211,8 +211,8 @@ def build_metadata():
sa.Index('hive_votes_post_id_idx', 'post_id'),
sa.Index('hive_votes_voter_id_idx', 'voter_id'),
- sa.Index('hive_votes_voter_id_permlink_id_idx', 'voter_id', 'permlink_id'),
- sa.Index('hive_votes_permlink_id_voter_id_idx', 'permlink_id', 'voter_id'),
+ sa.Index('hive_votes_voter_id_post_id_idx', 'voter_id', 'post_id'),
+ sa.Index('hive_votes_post_id_voter_id_idx', 'post_id', 'voter_id'),
sa.Index('hive_votes_block_num_idx', 'block_num')
)
@@ -844,9 +844,9 @@ def setup(db):
db.query_no_return(sql)
sql = """
- DROP VIEW IF EXISTS hive_votes_accounts_permlinks_view
+ DROP VIEW IF EXISTS hive_votes_view
;
- CREATE OR REPLACE VIEW hive_votes_accounts_permlinks_view
+ CREATE OR REPLACE VIEW hive_votes_view
AS
SELECT
hv.voter_id as voter_id,
@@ -872,33 +872,35 @@ def setup(db):
db.query_no_return(sql)
sql = """
- DROP FUNCTION IF EXISTS list_votes( character varying, character varying, character varying, int, bool );
-
- CREATE OR REPLACE FUNCTION public.list_votes
+ DROP TYPE IF EXISTS database_api_vote CASCADE;
+
+ CREATE TYPE database_api_vote AS (
+ voter VARCHAR(16),
+ author VARCHAR(16),
+ permlink VARCHAR(255),
+ weight NUMERIC,
+ rshares BIGINT,
+ percent INT,
+ last_update TIMESTAMP,
+ num_changes INT,
+ reputation FLOAT4
+ );
+
+ DROP FUNCTION IF EXISTS list_votes_by_voter_comment( character varying, character varying, character varying, int );
+
+ CREATE OR REPLACE FUNCTION public.list_votes_by_voter_comment
(
in _VOTER hive_accounts.name%TYPE,
in _AUTHOR hive_accounts.name%TYPE,
in _PERMLINK hive_permlink_data.permlink%TYPE,
- in _LIMIT INT,
- in _IS_VOTER_COMMENT_SORT BOOLEAN
- )
- RETURNS TABLE
- (
- voter hive_accounts.name%TYPE,
- author hive_accounts.name%TYPE,
- permlink hive_permlink_data.permlink%TYPE,
- weight hive_votes.weight%TYPE,
- rshares hive_votes.rshares%TYPE,
- percent hive_votes.vote_percent%TYPE,
- last_update hive_votes.last_update%TYPE,
- num_changes hive_votes.num_changes%TYPE,
- reputation hive_accounts.reputation%TYPE
+ in _LIMIT INT
)
+ RETURNS SETOF database_api_vote
LANGUAGE 'plpgsql'
- VOLATILE
- AS $BODY$
+ AS
+ $function$
DECLARE _VOTER_ID INT;
- DECLARE _PERMLINK_ID INT;
+ DECLARE _POST_ID INT;
BEGIN
IF _VOTER = '' THEN
@@ -911,60 +913,90 @@ def setup(db):
);
END IF;
- _PERMLINK_ID = find_comment_id( _AUTHOR, _PERMLINK, True);
+ _POST_ID = find_comment_id( _AUTHOR, _PERMLINK, True);
- IF _IS_VOTER_COMMENT_SORT = True THEN
- RETURN QUERY
- (
- SELECT
- v.voter,
- v.author,
- v.permlink,
- v.weight,
- v.rshares,
- v.percent,
- v.last_update,
- v.num_changes,
- v.reputation
- FROM
- hive_votes_accounts_permlinks_view v
- WHERE
- ( v.voter_id = _VOTER_ID and v.permlink_id >= _PERMLINK_ID )
- OR
- ( v.voter_id > _VOTER_ID )
- ORDER BY
- voter_id,
- permlink_id
- LIMIT _LIMIT
- );
+ RETURN QUERY
+ (
+ SELECT
+ v.voter,
+ v.author,
+ v.permlink,
+ v.weight,
+ v.rshares,
+ v.percent,
+ v.last_update,
+ v.num_changes,
+ v.reputation
+ FROM
+ hive_votes_view v
+ WHERE
+ ( v.voter_id = _VOTER_ID and v.post_id >= _POST_ID )
+ OR
+ ( v.voter_id > _VOTER_ID )
+ ORDER BY
+ voter_id,
+ post_id
+ LIMIT _LIMIT
+ );
+
+ END
+ $function$;
+
+ DROP FUNCTION IF EXISTS list_votes_by_comment_voter( character varying, character varying, character varying, int );
+
+ CREATE OR REPLACE FUNCTION public.list_votes_by_comment_voter
+ (
+ in _VOTER hive_accounts.name%TYPE,
+ in _AUTHOR hive_accounts.name%TYPE,
+ in _PERMLINK hive_permlink_data.permlink%TYPE,
+ in _LIMIT INT
+ )
+ RETURNS SETOF database_api_vote
+ LANGUAGE 'plpgsql'
+ AS
+ $function$
+ DECLARE _VOTER_ID INT;
+ DECLARE _POST_ID INT;
+ BEGIN
+
+ IF _VOTER = '' THEN
+ _VOTER_ID = 0;
ELSE
- RETURN QUERY
- (
- SELECT
- v.voter,
- v.author,
- v.permlink,
- v.weight,
- v.rshares,
- v.percent,
- v.last_update,
- v.num_changes,
- v.reputation
- FROM
- hive_votes_accounts_permlinks_view v
- WHERE
- ( v.permlink_id = _PERMLINK_ID and v.voter_id >= _VOTER_ID )
- OR
- ( v.permlink_id > _PERMLINK_ID )
- ORDER BY
- permlink_id,
- voter_id
- LIMIT _LIMIT
- );
+ _VOTER_ID =
+ (
+ SELECT id FROM hive_accounts
+ WHERE name=_VOTER
+ );
END IF;
+ _POST_ID = find_comment_id( _AUTHOR, _PERMLINK, True);
+
+ RETURN QUERY
+ (
+ SELECT
+ v.voter,
+ v.author,
+ v.permlink,
+ v.weight,
+ v.rshares,
+ v.percent,
+ v.last_update,
+ v.num_changes,
+ v.reputation
+ FROM
+ hive_votes_view v
+ WHERE
+ ( v.post_id = _POST_ID and v.voter_id >= _VOTER_ID )
+ OR
+ ( v.post_id > _POST_ID )
+ ORDER BY
+ post_id,
+ voter_id
+ LIMIT _LIMIT
+ );
+
END
- $BODY$;
+ $function$;
"""
db.query_no_return(sql)
diff --git a/hive/server/bridge_api/methods.py b/hive/server/bridge_api/methods.py
index aa47254af..970629487 100644
--- a/hive/server/bridge_api/methods.py
+++ b/hive/server/bridge_api/methods.py
@@ -2,7 +2,7 @@
import hive.server.bridge_api.cursor as cursor
from hive.server.bridge_api.objects import load_posts, load_posts_reblogs, load_profiles, _bridge_post_object
-from hive.server.database_api.methods import find_votes, VotesPresentation
+from hive.server.database_api.methods import find_votes_impl, VotesPresentation
from hive.server.common.helpers import (
return_error_info,
valid_account,
@@ -109,7 +109,7 @@ async def get_post(context, author, permlink, observer=None):
result = await db.query_all(sql, author=author, permlink=permlink)
assert len(result) == 1, 'invalid author/permlink or post not found in cache'
post = _bridge_post_object(result[0])
- post['active_votes'] = await find_votes({'db':db}, author, permlink, VotesPresentation.BridgeApi)
+ post['active_votes'] = await find_votes_impl({'db':db}, author, permlink, VotesPresentation.BridgeApi)
post = await append_statistics_to_post(post, result[0], False, blacklists_for_user)
return post
@@ -213,7 +213,7 @@ async def get_ranked_posts(context, sort, start_author='', start_permlink='',
pinned_result = await db.query_all(pinned_sql, author=start_author, limit=limit, tag=tag, permlink=start_permlink, community_name=tag, observer=observer)
for row in pinned_result:
post = _bridge_post_object(row)
- post['active_votes'] = await find_votes({'db':db}, row['author'], row['permlink'], VotesPresentation.BridgeApi)
+ post['active_votes'] = await find_votes_impl({'db':db}, row['author'], row['permlink'], VotesPresentation.BridgeApi)
post = await append_statistics_to_post(post, row, True, blacklists_for_user)
limit = limit - 1
posts.append(post)
@@ -222,7 +222,7 @@ async def get_ranked_posts(context, sort, start_author='', start_permlink='',
sql_result = await db.query_all(sql, author=start_author, limit=limit, tag=tag, permlink=start_permlink, community_name=tag, observer=observer)
for row in sql_result:
post = _bridge_post_object(row)
- post['active_votes'] = await find_votes({'db':db}, row['author'], row['permlink'], VotesPresentation.BridgeApi)
+ post['active_votes'] = await find_votes_impl({'db':db}, row['author'], row['permlink'], VotesPresentation.BridgeApi)
post = await append_statistics_to_post(post, row, False, blacklists_for_user)
if post['post_id'] in pinned_post_ids:
continue
@@ -314,7 +314,7 @@ async def get_account_posts(context, sort, account, start_author='', start_perml
sql_result = await db.query_all(sql, account=account, author=start_author, permlink=start_permlink, limit=limit)
for row in sql_result:
post = _bridge_post_object(row)
- post['active_votes'] = await find_votes({'db':db}, row['author'], row['permlink'], VotesPresentation.BridgeApi)
+ post['active_votes'] = await find_votes_impl({'db':db}, row['author'], row['permlink'], VotesPresentation.BridgeApi)
post = await append_statistics_to_post(post, row, False, blacklists_for_user)
posts.append(post)
return posts
diff --git a/hive/server/bridge_api/objects.py b/hive/server/bridge_api/objects.py
index e7d7e20d6..1f7ddbbcd 100644
--- a/hive/server/bridge_api/objects.py
+++ b/hive/server/bridge_api/objects.py
@@ -5,7 +5,7 @@ import ujson as json
from hive.server.common.mutes import Mutes
from hive.server.common.helpers import json_date
-from hive.server.database_api.methods import find_votes, VotesPresentation
+from hive.server.database_api.methods import find_votes_impl, VotesPresentation
from hive.utils.normalize import sbd_amount
from hive.indexer.votes import Votes
@@ -100,7 +100,7 @@ async def load_posts_keyed(db, ids, truncate_body=0):
row['author_rep'] = author['reputation']
post = _bridge_post_object(row, truncate_body=truncate_body)
- post['active_votes'] = await find_votes({'db':db}, row['author'], row['permlink'], VotesPresentation.BridgeApi)
+ post['active_votes'] = await find_votes_impl({'db':db}, row['author'], row['permlink'], VotesPresentation.BridgeApi)
post['blacklists'] = Mutes.lists(post['author'], author['reputation'])
diff --git a/hive/server/bridge_api/thread.py b/hive/server/bridge_api/thread.py
index af8f07e19..145534810 100644
--- a/hive/server/bridge_api/thread.py
+++ b/hive/server/bridge_api/thread.py
@@ -4,7 +4,7 @@ import logging
from hive.server.bridge_api.objects import load_posts_keyed, _bridge_post_object
from hive.server.bridge_api.methods import append_statistics_to_post
-from hive.server.database_api.methods import find_votes, VotesPresentation
+from hive.server.database_api.methods import find_votes_impl, VotesPresentation
from hive.server.common.helpers import (
return_error_info,
valid_account,
@@ -95,7 +95,7 @@ async def get_discussion(context, author, permlink, observer=None):
root_id = rows[0]['id']
all_posts = {}
root_post = _bridge_post_object(rows[0])
- root_post['active_votes'] = await find_votes({'db':db}, rows[0]['author'], rows[0]['permlink'], VotesPresentation.BridgeApi)
+ root_post['active_votes'] = await find_votes_impl({'db':db}, rows[0]['author'], rows[0]['permlink'], VotesPresentation.BridgeApi)
root_post = await append_statistics_to_post(root_post, rows[0], False, blacklists_for_user)
root_post['replies'] = []
all_posts[root_id] = root_post
@@ -108,7 +108,7 @@ async def get_discussion(context, author, permlink, observer=None):
parent_to_children_id_map[parent_id] = []
parent_to_children_id_map[parent_id].append(rows[index]['id'])
post = _bridge_post_object(rows[index])
- post['active_votes'] = await find_votes({'db':db}, rows[index]['author'], rows[index]['permlink'], VotesPresentation.BridgeApi)
+ post['active_votes'] = await find_votes_impl({'db':db}, rows[index]['author'], rows[index]['permlink'], VotesPresentation.BridgeApi)
post = await append_statistics_to_post(post, rows[index], False, blacklists_for_user)
post['replies'] = []
all_posts[post['post_id']] = post
diff --git a/hive/server/condenser_api/methods.py b/hive/server/condenser_api/methods.py
index 81c90efaa..bf3375c65 100644
--- a/hive/server/condenser_api/methods.py
+++ b/hive/server/condenser_api/methods.py
@@ -15,7 +15,7 @@ from hive.server.common.helpers import (
valid_limit,
valid_follow_type)
from hive.server.common.mutes import Mutes
-from hive.server.database_api.methods import find_votes, VotesPresentation
+from hive.server.database_api.methods import find_votes_impl, VotesPresentation
from hive.utils.normalize import rep_to_raw, time_string_with_t
# pylint: disable=too-many-arguments,line-too-long,too-many-lines
@@ -154,7 +154,7 @@ async def get_content(context, author: str, permlink: str, observer=None):
if result:
result = dict(result[0])
post = _condenser_post_object(result, 0)
- post['active_votes'] = await find_votes(context, author, permlink, VotesPresentation.CondenserApi)
+ post['active_votes'] = await find_votes_impl(context, author, permlink, VotesPresentation.CondenserApi)
if not observer:
post['active_votes'] = _mute_votes(post['active_votes'], Mutes.all())
else:
@@ -272,7 +272,7 @@ async def get_discussions_by(discussion_type, context, start_author: str = '',
posts = []
for row in result:
post = _condenser_post_object(row, truncate_body)
- post['active_votes'] = await find_votes(context, post['author'], post['permlink'])
+ post['active_votes'] = await find_votes_impl(context, post['author'], post['permlink'], VotesPresentation.DatabaseApi )
post['active_votes'] = _mute_votes(post['active_votes'], Mutes.all())
posts.append(post)
#posts = await resultset_to_posts(db=db, resultset=result, truncate_body=truncate_body)
@@ -381,7 +381,7 @@ async def get_discussions_by_blog(context, tag: str = None, start_author: str =
for row in result:
row = dict(row)
post = _condenser_post_object(row, truncate_body=truncate_body)
- post['active_votes'] = await find_votes(context, post['author'], post['permlink'], votes_presentation = VotesPresentation.CondenserApi)
+ post['active_votes'] = await find_votes_impl(context, post['author'], post['permlink'], VotesPresentation.CondenserApi)
post['active_votes'] = _mute_votes(post['active_votes'], Mutes.all())
#posts_by_id[row['post_id']] = post
posts_by_id.append(post)
@@ -439,7 +439,7 @@ async def get_discussions_by_comments(context, start_author: str = None, start_p
for row in result:
row = dict(row)
post = _condenser_post_object(row, truncate_body=truncate_body)
- post['active_votes'] = await find_votes(context, post['author'], post['permlink'], VotesPresentation.CondenserApi)
+ post['active_votes'] = await find_votes_impl(context, post['author'], post['permlink'], VotesPresentation.CondenserApi)
post['active_votes'] = _mute_votes(post['active_votes'], Mutes.all())
posts.append(post)
@@ -592,4 +592,4 @@ async def get_active_votes(context, author: str, permlink: str):
valid_permlink(permlink)
db = context['db']
- return await find_votes( {'db':db}, author, permlink, VotesPresentation.ActiveVotes )
+ return await find_votes_impl( {'db':db}, author, permlink, VotesPresentation.ActiveVotes )
diff --git a/hive/server/condenser_api/objects.py b/hive/server/condenser_api/objects.py
index 37a040aa6..9fef75b65 100644
--- a/hive/server/condenser_api/objects.py
+++ b/hive/server/condenser_api/objects.py
@@ -6,7 +6,7 @@ import ujson as json
from hive.utils.normalize import sbd_amount, rep_to_raw
from hive.server.common.mutes import Mutes
from hive.server.common.helpers import json_date
-from hive.server.database_api.methods import find_votes, VotesPresentation
+from hive.server.database_api.methods import find_votes_impl, VotesPresentation
log = logging.getLogger(__name__)
@@ -89,7 +89,7 @@ async def load_posts_keyed(db, ids, truncate_body=0):
row['author_rep'] = author_reps[row['author']]
post = _condenser_post_object(row, truncate_body=truncate_body)
- post['active_votes'] = await find_votes({'db':db}, row['author'], row['permlink'], VotesPresentation.CondenserApi)
+ post['active_votes'] = await find_votes_impl({'db':db}, row['author'], row['permlink'], VotesPresentation.CondenserApi)
posts_by_id[row['id']] = post
return posts_by_id
@@ -139,7 +139,7 @@ async def resultset_to_posts(db, resultset, truncate_body=0):
row = dict(row)
row['author_rep'] = author_reps[row['author']]
post = _condenser_post_object(row, truncate_body=truncate_body)
- post['active_votes'] = await find_votes({'db':db}, row['author'], row['permlink'], VotesPresentation.CondenserApi)
+ post['active_votes'] = await find_votes_impl({'db':db}, row['author'], row['permlink'], VotesPresentation.CondenserApi)
posts.append(post)
return posts
diff --git a/hive/server/database_api/methods.py b/hive/server/database_api/methods.py
index 914f1b9d6..bf906e013 100644
--- a/hive/server/database_api/methods.py
+++ b/hive/server/database_api/methods.py
@@ -188,7 +188,7 @@ def api_vote_info(rows, votes_presentation):
return ret
@return_error_info
-async def find_votes(context, author: str, permlink: str, votes_presentation = VotesPresentation.DatabaseApi):
+async def find_votes_impl(context, author: str, permlink: str, votes_presentation):
""" Returns all votes for the given post """
valid_account(author)
valid_permlink(permlink)
@@ -205,7 +205,7 @@ async def find_votes(context, author: str, permlink: str, votes_presentation = V
num_changes,
reputation
FROM
- hive_votes_accounts_permlinks_view
+ hive_votes_view
WHERE
author = :author AND permlink = :permlink
ORDER BY
@@ -216,7 +216,7 @@ async def find_votes(context, author: str, permlink: str, votes_presentation = V
return api_vote_info(rows, votes_presentation)
@return_error_info
-async def list_votes(context, start: list, limit: int, order: str, votes_presentation = VotesPresentation.DatabaseApi):
+async def list_votes_impl(context, start: list, limit: int, order: str, votes_presentation):
""" Returns all votes, starting with the specified voter and/or author and permlink. """
supported_order_list = ["by_comment_voter", "by_voter_comment"]
assert order in supported_order_list, "Order {} is not supported".format(order)
@@ -227,10 +227,18 @@ async def list_votes(context, start: list, limit: int, order: str, votes_present
sql=""
if order == "by_voter_comment":
- sql = "select * from list_votes( '{}', '{}', '{}', {}, true )".format( start[0], start[1], start[2], limit )
+ sql = "select * from list_votes_by_voter_comment( '{}', '{}', '{}', {} )".format( start[0], start[1], start[2], limit )
else:
- sql = "select * from list_votes( '{}', '{}', '{}', {}, false )".format( start[2], start[0], start[1], limit )
+ sql = "select * from list_votes_by_comment_voter( '{}', '{}', '{}', {} )".format( start[2], start[0], start[1], limit )
rows = await db.query_all(sql)
return api_vote_info(rows, votes_presentation)
+
+@return_error_info
+async def find_votes(context, author: str, permlink: str):
+ return await find_votes_impl( context, author, permlink, VotesPresentation.DatabaseApi)
+
+@return_error_info
+async def list_votes(context, start: list, limit: int, order: str):
+ return await list_votes_impl( context, start, limit, order, VotesPresentation.DatabaseApi)
diff --git a/hive/server/tags_api/methods.py b/hive/server/tags_api/methods.py
index 5d8570d52..ff1d14766 100644
--- a/hive/server/tags_api/methods.py
+++ b/hive/server/tags_api/methods.py
@@ -21,7 +21,7 @@ async def get_active_votes(context, author: str, permlink: str):
hv.last_update,
hv.num_changes
FROM
- hive_votes_accounts_permlinks_view hv
+ hive_votes_view hv
WHERE hv.author = :author AND hv.permlink = :permlink
"""
ret = []
--
GitLab