diff --git a/hive/db/schema.py b/hive/db/schema.py
index 40460ad3d93f0eeebc30aa07c93e236723a304ee..7808074d806b46fa980f79477171ccecf5439e02 100644
--- a/hive/db/schema.py
+++ b/hive/db/schema.py
@@ -589,7 +589,9 @@ def setup(db):
"condenser_get_follow_counts.sql",
"condenser_get_names_by_followers.sql",
"condenser_get_names_by_following.sql",
- "condenser_get_names_by_reblogged.sql"
+ "condenser_get_names_by_reblogged.sql",
+ "condenser_get_discussions_by_comments.sql",
+ "condenser_get_account_reputations.sql"
]
from os.path import dirname, realpath
diff --git a/hive/db/sql_scripts/condenser_get_account_reputations.sql b/hive/db/sql_scripts/condenser_get_account_reputations.sql
new file mode 100644
index 0000000000000000000000000000000000000000..5a9a8a33ce13bbcfe84c9052a88e7c63a29ebd42
--- /dev/null
+++ b/hive/db/sql_scripts/condenser_get_account_reputations.sql
@@ -0,0 +1,28 @@
+DROP FUNCTION IF EXISTS condenser_get_account_reputations;
+
+CREATE OR REPLACE FUNCTION condenser_get_account_reputations(
+ in _account_lower_bound VARCHAR,
+ in _without_lower_bound BOOLEAN,
+ in _limit INTEGER
+)
+RETURNS TABLE
+(
+ name hive_accounts.name%TYPE,
+ reputation hive_accounts.reputation%TYPE
+)
+AS
+$function$
+DECLARE
+
+BEGIN
+
+ RETURN QUERY SELECT
+ ha.name, ha.reputation
+ FROM hive_accounts ha
+ WHERE _without_lower_bound OR ( ha.name >= _account_lower_bound )
+ ORDER BY name
+ LIMIT _limit;
+
+END
+$function$
+language plpgsql STABLE;
diff --git a/hive/db/sql_scripts/condenser_get_discussions_by_comments.sql b/hive/db/sql_scripts/condenser_get_discussions_by_comments.sql
new file mode 100644
index 0000000000000000000000000000000000000000..2da2db5b8f10765d0a5fc5b86951d92070f6b4ab
--- /dev/null
+++ b/hive/db/sql_scripts/condenser_get_discussions_by_comments.sql
@@ -0,0 +1,64 @@
+DROP FUNCTION IF EXISTS condenser_get_discussions_by_comments;
+
+CREATE OR REPLACE FUNCTION condenser_get_discussions_by_comments(
+ in _author VARCHAR,
+ in _permlink VARCHAR,
+ in _limit INTEGER
+)
+RETURNS SETOF bridge_api_post
+AS
+$function$
+DECLARE
+ __post_id INTEGER := 0;
+BEGIN
+
+ IF _permlink <> '' THEN
+ __post_id = find_comment_id( _author, _permlink, True );
+ END IF;
+
+ RETURN QUERY SELECT
+ hp.id,
+ hp.author,
+ hp.parent_author,
+ hp.author_rep,
+ hp.root_title,
+ hp.beneficiaries,
+ hp.max_accepted_payout,
+ hp.percent_hbd,
+ hp.url,
+ hp.permlink,
+ hp.parent_permlink_or_category,
+ hp.title,
+ hp.body,
+ hp.category,
+ hp.depth,
+ hp.promoted,
+ hp.payout,
+ hp.pending_payout,
+ hp.payout_at,
+ hp.is_paidout,
+ hp.children,
+ hp.votes,
+ hp.created_at,
+ hp.updated_at,
+ hp.rshares,
+ hp.abs_rshares,
+ hp.json,
+ hp.is_hidden,
+ hp.is_grayed,
+ hp.total_votes,
+ hp.sc_trend,
+ hp.role_title,
+ hp.community_title,
+ hp.role_id,
+ hp.is_pinned,
+ hp.curator_payout_value
+ FROM hive_posts_view hp
+ WHERE
+ hp.author = _author AND hp.depth > 0 AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) )
+ ORDER BY hp.id DESC, hp.depth
+ LIMIT _limit;
+
+END
+$function$
+language plpgsql STABLE;
diff --git a/hive/server/condenser_api/cursor.py b/hive/server/condenser_api/cursor.py
index 459f9433c2669ea40be6ae3360e5f558098d0fc5..585c74bc268522d5023c22209d7b5d2da279a39d 100644
--- a/hive/server/condenser_api/cursor.py
+++ b/hive/server/condenser_api/cursor.py
@@ -7,18 +7,6 @@ from hive.server.database_api.methods import find_votes_impl, VotesPresentation
# pylint: disable=too-many-lines
-async def get_post_id(db, author, permlink):
- """Given an author/permlink, retrieve the id from db."""
- sql = """
- SELECT
- hp.id
- FROM hive_posts hp
- INNER JOIN hive_accounts ha_a ON ha_a.id = hp.author_id
- INNER JOIN hive_permlink_data hpd_p ON hpd_p.id = hp.permlink_id
- WHERE ha_a.name = :author AND hpd_p.permlink = :permlink
- AND counter_deleted = 0 LIMIT 1""" # ABW: replace with find_comment_id(:author,:permlink,True)?
- return await db.query_one(sql, author=author, permlink=permlink)
-
async def get_followers(db, account: str, start: str, follow_type: str, limit: int):
"""Get a list of accounts following by a given account."""
state = 2 if follow_type == 'ignore' else 1
diff --git a/hive/server/condenser_api/methods.py b/hive/server/condenser_api/methods.py
index 1afd95d412139cd5aa9e1fd41dbb77daa053ab92..ebde88edb669fa6f155962e0dd77d3bea13d39af 100644
--- a/hive/server/condenser_api/methods.py
+++ b/hive/server/condenser_api/methods.py
@@ -20,51 +20,6 @@ from hive.server.hive_api.public import get_by_feed_with_reblog_impl
# pylint: disable=too-many-arguments,line-too-long,too-many-lines
-SQL_TEMPLATE = """
- SELECT
- hp.id,
- hp.author,
- hp.permlink,
- hp.author_rep,
- hp.title,
- hp.body,
- hp.category,
- hp.depth,
- hp.promoted,
- hp.payout,
- hp.pending_payout,
- hp.payout_at,
- hp.is_paidout,
- hp.children,
- hp.votes,
- hp.created_at,
- hp.updated_at,
- hp.rshares,
- hp.abs_rshares,
- hp.json,
- hp.is_hidden,
- hp.is_grayed,
- hp.total_votes,
- hp.net_votes,
- hp.total_vote_weight,
- hp.parent_author,
- hp.parent_permlink_or_category,
- hp.curator_payout_value,
- hp.root_author,
- hp.root_permlink,
- hp.max_accepted_payout,
- hp.percent_hbd,
- hp.allow_replies,
- hp.allow_votes,
- hp.allow_curation_rewards,
- hp.beneficiaries,
- hp.url,
- hp.root_title,
- hp.active,
- hp.author_rewards
- FROM hive_posts_view hp
-"""
-
@return_error_info
async def get_account_votes(context, account):
"""Return an info message about get_acccount_votes being unsupported."""
@@ -137,15 +92,8 @@ async def get_account_reputations(context, account_lower_bound: str = None, limi
async def _get_account_reputations_impl(db, fat_node_style, account_lower_bound, limit):
"""Enumerate account reputations."""
limit = valid_limit(limit, 1000, None)
- seek = ''
- if account_lower_bound:
- seek = "WHERE name >= :start"
-
- sql = """SELECT name, reputation
- FROM hive_accounts %s
- ORDER BY name
- LIMIT :limit""" % seek
+ sql = "SELECT * FROM condenser_get_account_reputations( '{}', {}, {} )".format( account_lower_bound, account_lower_bound is None, limit )
rows = await db.query_all(sql, start=account_lower_bound, limit=limit)
if fat_node_style:
return [dict(account=r[0], reputation=r[1]) for r in rows]
@@ -370,7 +318,6 @@ async def get_discussions_by_feed(context, tag: str = None, start_author: str =
valid_limit(limit, 100, 20),
truncate_body)
-
@return_error_info
@nested_query_compat
async def get_discussions_by_comments(context, start_author: str = None, start_permlink: str = '',
@@ -383,25 +330,11 @@ async def get_discussions_by_comments(context, start_author: str = None, start_p
valid_permlink(start_permlink, allow_empty=True)
valid_limit(limit, 100, 20)
- #force copy
- sql = str(SQL_TEMPLATE)
- sql += """
- WHERE
- hp.author = :start_author AND hp.depth > 0
- """
-
- if start_permlink:
- sql += """
- AND hp.id <= (SELECT hive_posts.id FROM hive_posts WHERE author_id = (SELECT id FROM hive_accounts WHERE name = :start_author) AND permlink_id = (SELECT id FROM hive_permlink_data WHERE permlink = :start_permlink))
- """
-
- sql += """
- ORDER BY hp.id DESC, hp.depth LIMIT :limit
- """
-
posts = []
db = context['db']
- result = await db.query_all(sql, start_author=start_author, start_permlink=start_permlink, limit=limit)
+
+ sql = " SELECT * FROM condenser_get_discussions_by_comments( '{}', '{}', {} ) ".format( start_author, start_permlink, limit )
+ result = await db.query_all(sql)
for row in result:
row = dict(row)
diff --git a/hive/server/hive_api/common.py b/hive/server/hive_api/common.py
index 81d26393b9690463c7135505f7e1770f9768ad49..dd882678996101a7617e1eb6b3e482345692ddf1 100644
--- a/hive/server/hive_api/common.py
+++ b/hive/server/hive_api/common.py
@@ -17,24 +17,6 @@ async def get_community_id(db, name):
return await db.query_one("SELECT id FROM hive_communities WHERE name = :name",
name=name)
-async def url_to_id(db, url):
- """Get post_id based on post url."""
- return await get_post_id(db, *split_url(url))
-
-async def get_post_id(db, author, permlink):
- """Get post_id based on author/permlink."""
- sql = """
- SELECT
- hp.id, ha_a.name as author, hpd_p.permlink as permlink
- FROM
- hive_posts hp
- INNER JOIN hive_accounts ha_a ON ha_a.id = hp.author_id
- INNER JOIN hive_permlink_data hpd_p ON hpd_p.id = hp.permlink_id
- WHERE ha_a.name = :a AND hpd_p.permlink = :p"""
- _id = await db.query_one(sql, a=author, p=permlink)
- assert _id, 'post id not found'
- return _id
-
async def get_account_id(db, name):
"""Get account id from account name."""
assert name, 'no account name specified'
diff --git a/hive/server/hive_api/public.py b/hive/server/hive_api/public.py
index bdbdd95d864051b7007831c25a45a903912ddc13..f6415604c1f6b8ee3cc63565d9852b203ecf9bd5 100644
--- a/hive/server/hive_api/public.py
+++ b/hive/server/hive_api/public.py
@@ -83,7 +83,7 @@ async def get_info(context):
async def get_by_feed_with_reblog_impl(db, account: str, start_author: str = '',
start_permlink: str = '', limit: int = 20, truncate_body: int = 0):
- """Get a list of [post_id, reblogged_by_str] for an account's feed."""
+ """Get a list of posts for an account's feed."""
sql = " SELECT * FROM condenser_get_by_feed_with_reblog( '{}', '{}', '{}', {} ) ".format( account, start_author, start_permlink, limit )
result = await db.query_all(sql)
diff --git a/hive/server/hive_api/thread.py b/hive/server/hive_api/thread.py
deleted file mode 100644
index 2f218164ac7fb1f742b9955c98d57bded5bd7426..0000000000000000000000000000000000000000
--- a/hive/server/hive_api/thread.py
+++ /dev/null
@@ -1,134 +0,0 @@
-"""Hive API: Threaded discussion handling"""
-import logging
-
-from hive.server.hive_api.common import url_to_id, valid_comment_sort, valid_limit
-from hive.server.hive_api.objects import comments_by_id
-log = logging.getLogger(__name__)
-
-# pylint: disable=too-many-arguments
-
-async def fetch_tree(context, root, sort='top', limit=20, observer=None):
- """Fetch comment tree. Includes comments and lite author data.
-
- If community: follows/applies mod rules
- If blog: hides comments by any muted accounts of the author's
- Sort: new, old, hot, payout"""
- db = context['db']
- root_id = await url_to_id(db, root)
- return await _fetch_children(db, root_id, None,
- valid_comment_sort(sort),
- valid_limit(limit, 50, 20),
- observer)
-
-async def fetch_more_children(context, root_id, last_sibling_id, sort='top',
- limit=20, observer=None):
- """Fetch truncated siblings from tree."""
- db = context['db']
- return await _fetch_children(db, root_id, last_sibling_id,
- valid_comment_sort(sort),
- valid_limit(limit, 50, 20),
- observer)
-
-_SORTS = dict(hot='sc_hot', top='payout', new='id')
-async def _fetch_children(db, root_id, start_id, sort, limit, observer=None):
- """Fetch truncated children from tree."""
- mutes = set()
- field = _SORTS[sort]
-
- # load id skeleton
- tree, parent = await _load_tree(db, root_id, mutes, max_depth=3)
-
- # find most relevant ids in subset
- seek = ''
- if start_id:
- seek = """AND %s < (SELECT %s FROM hive_posts
- WHERE id = :start_id)""" % (field, field)
- sql = """SELECT id FROM hive_posts
- WHERE id IN :ids %s ORDER BY %s DESC
- LIMIT :limit""" % (seek, field)
- relevant_ids = await db.query_col(sql, ids=tuple(parent.keys()),
- start_id=start_id, limit=limit)
-
- # fill in missing parents
- for _id in relevant_ids:
- if _id != root_id:
- if parent[_id] not in relevant_ids:
- relevant_ids.append(parent[_id])
-
- # load objects and assemble response tree
- comments = await comments_by_id(db, relevant_ids, observer)
-
- return {'accounts': comments['accounts'],
- 'posts': _build_tree(tree[root_id], tree, comments['posts'], sort_ids=relevant_ids)}
-
-
-def _build_tree(root_ids, tree, comments, sort_ids):
- # comments is sorted...
-
- ret = []
- for root_id in sorted(root_ids, key=sort_ids.index):
- assert root_id in comments, 'root not loaded'
- out = comments[root_id]
- out['type'] = 'comment'
-
- if root_id in tree:
- missing = 0
- loaded_ids = []
- for cid in tree[root_id]:
- if cid in comments:
- assert not missing, 'missing mode: not expected to find'
- loaded_ids.append(cid)
- else:
- missing += 1
-
- if loaded_ids:
- out['children'] = _build_tree(loaded_ids, tree, comments, sort_ids)
- else:
- out['children'] = []
- if missing:
- last_id = loaded_ids[-1] if loaded_ids else None
- out['children'].append({'type': 'more-children',
- 'root_id': root_id,
- 'last_id': last_id,
- 'count': missing})
-
- ret.append(out)
-
- return ret
-
-
-async def _load_tree(db, root_id, muted, max_depth):
- """Build `ids` list and `tree` map."""
- parent = {} # only loaded to max_depth
- tree = {} # loaded to max_depth + 1
- todo = [root_id]
- depth = 0
- while todo:
- depth += 1
- rows = await _child_ids(db, todo, muted)
- todo = []
- for pid, cids in rows:
- tree[pid] = cids
- todo.extend(cids)
- if depth <= max_depth:
- for cid in cids:
- parent[cid] = pid
- if depth > max_depth:
- break
-
- return (tree, parent)
-
-async def _child_ids(db, parent_ids, muted):
- """Load child ids for multiple parent ids."""
- filt = 'AND author NOT IN :muted' if muted else ''
- sql = """
- SELECT parent_id, array_agg(id)
- FROM hive_posts
- WHERE parent_id IN :ids
- AND counter_deleted = 0
- AND is_muted = '0'
- AND is_valid = '1' %s
- GROUP BY parent_id
- """ % filt
- rows = await db.query_all(sql, ids=tuple(parent_ids), muted=tuple(muted))
- return [[row[0], row[1]] for row in rows]
diff --git a/test-log.txt b/test-log.txt
deleted file mode 100644
index 87ffa72bc55f4e6124bbfc4e315da4dbe0a43a71..0000000000000000000000000000000000000000
--- a/test-log.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite errors="0" failures="1" hostname="dev7" name="pytest" skipped="0" tests="1" time="0.620" timestamp="2020-11-02T14:41:30.207316"><testcase classname="condenser_api_patterns.get_state.gtg_permlink.tavern.yaml" name="Hivemind condenser_api.get_state patterns test" time="0.524"><failure message="Format variables: service.proto:s = 'http' service.server:s = '127.0.0.1' service.port = '6666' Source test stage (line 10): - name: get_state request: url: "{service.proto:s}://{service.server:s}:{service.port}/" method: POST headers: content-type: application/json json: jsonrpc: "2.0" id: 1 method: "condenser_api.get_state" params: ["/category/@gtg/witness-gtg"] response: status_code: 200 verify_response_with: function: validate_response:compare_response_with_pattern extra_kwargs: method: "gtg_permlink" Formatted stage: name: get_state request: headers: content-type: application/json json: id: 1 jsonrpc: '2.0' method: condenser_api.get_state params: - /category/@gtg/witness-gtg method: POST url: 'http://127.0.0.1:6666/' response: status_code: 200 verify_response_with: extra_kwargs: directory: condenser_api_patterns/get_state method: gtg_permlink function: validate_response:compare_response_with_pattern Errors: E tavern.util.exceptions.TestFailError: Test 'get_state' failed: - Error calling validate function '<function compare_response_with_pattern at 0x7fb40ec70598>': Traceback (most recent call last): File "/home/dev/.local/lib/python3.6/site-packages/tavern/response/base.py", line 141, in _maybe_run_validate_functions vf(response) File "/home/dev/.local/lib/python3.6/site-packages/tavern/schemas/extensions.py", line 123, in inner return func(response, *args, **kwargs) File "/home/dev/src/09.HIVE-HIVEMIND/hivemind/tests/tests_api/hivemind/tavern/validate_response.py", line 74, in compare_response_with_pattern raise PatternDiffException(msg) validate_response.PatternDiffException: Differences detected between response and pattern.">Format variables:
- service.proto:s = 'http'
- service.server:s = '127.0.0.1'
- service.port = '6666'
-
-Source test stage (line 10):
- - name: get_state
- request:
- url: "{service.proto:s}://{service.server:s}:{service.port}/"
- method: POST
- headers:
- content-type: application/json
- json:
- jsonrpc: "2.0"
- id: 1
- method: "condenser_api.get_state"
- params: ["/category/@gtg/witness-gtg"]
- response:
- status_code: 200
- verify_response_with:
- function: validate_response:compare_response_with_pattern
- extra_kwargs:
- method: "gtg_permlink"
-
-Formatted stage:
- name: get_state
- request:
- headers:
- content-type: application/json
- json:
- id: 1
- jsonrpc: '2.0'
- method: condenser_api.get_state
- params:
- - /category/@gtg/witness-gtg
- method: POST
- url: 'http://127.0.0.1:6666/'
- response:
- status_code: 200
- verify_response_with:
- extra_kwargs:
- directory: condenser_api_patterns/get_state
- method: gtg_permlink
- function: validate_response:compare_response_with_pattern
-
-Errors:
-E tavern.util.exceptions.TestFailError: Test 'get_state' failed:
- - Error calling validate function '<function compare_response_with_pattern at 0x7fb40ec70598>':
- Traceback (most recent call last):
- File "/home/dev/.local/lib/python3.6/site-packages/tavern/response/base.py", line 141, in _maybe_run_validate_functions
- vf(response)
- File "/home/dev/.local/lib/python3.6/site-packages/tavern/schemas/extensions.py", line 123, in inner
- return func(response, *args, **kwargs)
- File "/home/dev/src/09.HIVE-HIVEMIND/hivemind/tests/tests_api/hivemind/tavern/validate_response.py", line 74, in compare_response_with_pattern
- raise PatternDiffException(msg)
- validate_response.PatternDiffException: Differences detected between response and pattern.</failure></testcase></testsuite></testsuites>
\ No newline at end of file