8000 Bugfixes: · postgrespro/aqo@53e4f6b · GitHub
[go: up one dir, main page]

Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 53e4f6b

Browse files
committed
Bugfixes:
1. Increase stability of the pgbench test. 2. Open subsidiary AQO relations more carefully.
1 parent cb173a3 commit 53e4f6b

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

storage.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,15 +582,9 @@ update_fss(uint64 fs, int fss, OkNNrdata *data, List *relnames)
582582
* Ooops, somebody concurrently updated the tuple. It is possible
583583
* only in the case of changes made by third-party code.
584584
*/
585-
<<<<<<< HEAD
586585
elog(ERROR, "AQO data piece ("UINT64_FORMAT" %d) concurrently"
587586
" updated by a stranger backend.",
588587
fhash, fsshash);
589-
=======
590-
elog(ERROR, "AQO data piece (%ld %d) concurrently updated"
591-
" by a stranger backend.",
592-
fs, fss);
593-
>>>>>>> ecac693 (Move AQO from a relid based approach to a relation name based approach.)
594588
result = false;
595589
}
596590
}

0 commit comments

Comments
 (0)
0