Remove custom lock tags from the AQO storage.

Author: danolivo

aqo.c

@@ -304,22 +304,6 @@ get_aqo_schema(void)
 return result;
 }
 
-/*
-* Init userlock
-*/
-void
-init_lock_tag(LOCKTAG *tag, uint64 key1, int32 key2)
-{
-uint32 key = key1 % UINT32_MAX;
-
-tag->locktag_field1 = AQO_MODULE_MAGIC;
-tag->locktag_field2 = key;
-tag->locktag_field3 = (uint32) key2;
-tag->locktag_field4 = 0;
-tag->locktag_type = LOCKTAG_USERLOCK;
-tag->locktag_lockmethodid = USER_LOCKMETHOD;
-}
-
 /*
 * AQO is really needed for any activity?
 */

aqo.h

@@ -294,7 +294,6 @@ extern double *selectivity_cache_find_global_relid(int clause_hash,
 extern void selectivity_cache_clear(void);
 
 extern Oid get_aqo_schema(void);
-extern void init_lock_tag(LOCKTAG *tag, uint64 key1, int32 key2);
 extern bool IsQueryDisabled(void);
 
 extern List *cur_classes;

postprocessing.c

@@ -87,18 +87,11 @@ atomic_fss_learn_step(uint64 fs, int fss, OkNNrdata *data,
 double *features, double target, double rfactor,
 List *reloids, bool isTimedOut)
 {
-LOCKTAG tag;
-
-init_lock_tag(&tag, fs, fss);
-LockAcquire(&tag, ExclusiveLock, false, false);
-
 if (!load_fss_ext(fs, fss, data, NULL, !isTimedOut))
 data->rows = 0;
 
 data->rows = OkNNr_learn(data, features, target, rfactor);
 update_fss_ext(fs, fss, data, reloids, isTimedOut);
-
-LockRelease(&tag, ExclusiveLock, false);
 }
 
 static void
@@ -719,7 +712,6 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 StatEntry *stat;
 instr_time endtime;
 EphemeralNamedRelation	enr = get_ENR(queryDesc->queryEnv, PlanStateInfo);
-LOCKTAG tag;
 
 cardinality_sum_errors = 0.;
 cardinality_num_objects = 0;
@@ -773,10 +765,6 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 else
 cardinality_error = -1;
 
-/* Prevent concurrent updates. */
-init_lock_tag(&tag, query_context.query_hash, query_context.fspace_hash);
-LockAcquire(&tag, ExclusiveLock, false, false);
-
 if (query_context.collect_stat)
 {
 /* Write AQO statistics to the aqo_query_stat table */
@@ -795,9 +783,6 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 }
 }
 
-/* Allow concurrent queries to update this feature space. */
-LockRelease(&tag, ExclusiveLock, false);
-
 selectivity_cache_clear();
 cur_classes = ldelete_uint64(cur_classes, query_context.query_hash);
 

preprocessing.c

@@ -127,7 +127,6 @@ aqo_planner(Query *parse,
 ParamListInfo boundParams)
 {
 bool query_is_stored = false;
-LOCKTAG tag;
 MemoryContext	oldCxt;
 
 /*
@@ -291,13 +290,6 @@ aqo_planner(Query *parse,
 ignore_query_settings:
 if (!query_is_stored && (query_context.adding_query || force_collect_stat))
 {
-/*
-* find-add query and query text must be atomic operation to prevent
-* concurrent insertions.
-*/
-init_lock_tag(&tag, query_context.query_hash, 0);
-LockAcquire(&tag, ExclusiveLock, false, false);
-
 /*
 * Add query into the AQO knowledge base. To process an error with
 * concurrent addition from another backend we will try to restart
@@ -312,8 +304,6 @@ aqo_planner(Query *parse,
 * analysis. In the case of cached plans we may have NULL query text.
 */
 aqo_qtext_store(query_context.query_hash, query_string);
-
-LockRelease(&tag, ExclusiveLock, false);
 }
 
 if (force_collect_stat)