diff --git a/sql/swh-func.sql b/sql/swh-func.sql --- a/sql/swh-func.sql +++ b/sql/swh-func.sql @@ -377,21 +377,6 @@ $$; --- Retrieve information on directory from temporary table -create or replace function swh_directory_get() - returns setof directory - language plpgsql -as $$ -begin - return query - select d.* - from tmp_directory t - inner join directory d on t.id = d.id; - return; -end -$$; - - create type directory_entry_type as enum('file', 'dir', 'rev'); diff --git a/swh/storage/api/client.py b/swh/storage/api/client.py --- a/swh/storage/api/client.py +++ b/swh/storage/api/client.py @@ -47,9 +47,6 @@ def directory_missing(self, directories): return self.post('directory/missing', {'directories': directories}) - def directory_get(self, directories): - return self.post('directory', dict(directories=directories)) - def directory_ls(self, directory, recursive=False): return self.get('directory/ls', {'directory': directory, 'recursive': recursive}) diff --git a/swh/storage/api/server.py b/swh/storage/api/server.py --- a/swh/storage/api/server.py +++ b/swh/storage/api/server.py @@ -98,11 +98,6 @@ **decode_request(request))) -@app.route('/directory', methods=['POST']) -def directory_get(): - return encode_data(get_storage().directory_get(**decode_request(request))) - - @app.route('/directory/missing', methods=['POST']) def directory_missing(): return encode_data(get_storage().directory_missing( diff --git a/swh/storage/db.py b/swh/storage/db.py --- a/swh/storage/db.py +++ b/swh/storage/db.py @@ -420,12 +420,6 @@ else: return content - def directory_get_from_temp(self, cur=None): - cur = self._cursor(cur) - cur.execute('''SELECT id, file_entries, dir_entries, rev_entries - FROM swh_directory_get()''') - yield from cursor_to_bytes(cur) - def directory_missing_from_temp(self, cur=None): cur = self._cursor(cur) cur.execute('SELECT * FROM swh_directory_missing()') diff --git a/swh/storage/storage.py b/swh/storage/storage.py --- a/swh/storage/storage.py +++ b/swh/storage/storage.py @@ -442,27 +442,6 @@ for obj in db.directory_missing_from_temp(cur): yield obj[0] - @db_transaction_generator() - def directory_get(self, directories, db=None, cur=None): - """Get information on directories. - - Args: - - directories: an iterable of directory ids - - Returns: - List of directories as dict with keys and associated values. - - """ - keys = ('id', 'dir_entries', 'file_entries', 'rev_entries') - - db.mktemp('directory', cur) - db.copy_to(({'id': dir_id} for dir_id in directories), - 'tmp_directory', ['id'], cur) - - dirs = db.directory_get_from_temp(cur) - for line in dirs: - yield dict(zip(keys, line)) - @db_transaction_generator(statement_timeout=2000) def directory_ls(self, directory, recursive=False, db=None, cur=None): """Get entries for one directory. diff --git a/swh/storage/tests/test_storage.py b/swh/storage/tests/test_storage.py --- a/swh/storage/tests/test_storage.py +++ b/swh/storage/tests/test_storage.py @@ -804,29 +804,6 @@ self.assertEqual(list(gen), [missing_cont]) @istest - def directory_get(self): - # given - init_missing = list(self.storage.directory_missing([self.dir['id']])) - self.assertEqual([self.dir['id']], init_missing) - - self.storage.directory_add([self.dir]) - - # when - actual_dirs = list(self.storage.directory_get([self.dir['id']])) - - self.assertEqual(len(actual_dirs), 1) - - dir0 = actual_dirs[0] - self.assertEqual(dir0['id'], self.dir['id']) - # ids are generated so non deterministic value - self.assertEqual(len(dir0['file_entries']), 1) - self.assertEqual(len(dir0['dir_entries']), 1) - self.assertIsNone(dir0['rev_entries']) - - after_missing = list(self.storage.directory_missing([self.dir['id']])) - self.assertEqual([], after_missing) - - @istest def directory_add(self): init_missing = list(self.storage.directory_missing([self.dir['id']])) self.assertEqual([self.dir['id']], init_missing)