Imrote test to cover previous commit. Daniil Davidov

[online_analyze.git] / online_analyze.c

diff --git a/online_analyze.c b/online_analyze.c
index 5791dd6..0479dbf 100644 (file)
--- a/online_analyze.c
+++ b/online_analyze.c
@@ -171,7 +171,12 @@ tableListAssign(const char * newval, bool doit, TableList *tbl)
        * follow work could be done only in normal processing because of
        * accsess to system catalog
        */
-       if (MyBackendId == InvalidBackendId || !IsUnderPostmaster ||
+#if PG_VERSION_NUM >= 170000
+       if (MyProcNumber == INVALID_PROC_NUMBER ||
+#else
+       if (MyBackendId == InvalidBackendId ||
+#endif
+               !IsUnderPostmaster ||
                !IsTransactionState())
        {
                includeTables.inited = false;
@@ -191,7 +196,10 @@ tableListAssign(const char * newval, bool doit, TableList *tbl)
        foreach(l, namelist)
        {
                char    *curname = (char *) lfirst(l);
-#if PG_VERSION_NUM >= 90200
+#if PG_VERSION_NUM >= 160000
+               Oid             relOid = RangeVarGetRelid(makeRangeVarFromNameList(
+                                                       stringToQualifiedNameList(curname, NULL)), NoLock, true);
+#elif PG_VERSION_NUM >= 90200
                Oid             relOid = RangeVarGetRelid(makeRangeVarFromNameList(
                                                        stringToQualifiedNameList(curname)), NoLock, true);
 #else
@@ -311,7 +319,12 @@ lateInit()
        TableList       *tl[] = {&includeTables, &excludeTables};
        int i;
 
-       if (MyBackendId == InvalidBackendId || !IsUnderPostmaster ||
+#if PG_VERSION_NUM >= 170000
+       if (MyProcNumber == INVALID_PROC_NUMBER ||
+#else
+       if (MyBackendId == InvalidBackendId ||
+#endif
+               !IsUnderPostmaster ||
                !IsTransactionState())
                return; /* we aren't in connected state */
 
@@ -795,8 +808,13 @@ onlineAnalyzeHooker(QueryDesc *queryDesc)
        {
                Datum           tblnamed = constval->constvalue;
                char            *tblname = text_to_cstring(DatumGetTextP(tblnamed));
+#if PG_VERSION_NUM >= 160000
+               RangeVar        *tblvar =
+                       makeRangeVarFromNameList(stringToQualifiedNameList(tblname, NULL));
+#else
                RangeVar        *tblvar =
                        makeRangeVarFromNameList(stringToQualifiedNameList(tblname));
+#endif
 
                makeAnalyze(RangeVarGetRelid(tblvar,
                                                                         NoLock,
@@ -1030,6 +1048,16 @@ onlineAnalyzeHookerUtility(
                        }
                        else
                                tblnames = NIL;
+               } else if (IsA(parsetree, CopyStmt)) {
+                       CopyStmt   *cpystmt = (CopyStmt*) parsetree;
+
+                       /* Create tblnames only if it is not "COPY (query) TO file" command */
+                       if (cpystmt->relation) {
+                               tblnames = list_make1((RangeVar*)copyObject(cpystmt->relation));
+                               op = CK_CREATE;
+                       }
+                       else
+                               Assert(cpystmt->query);
                }
        }
 
@@ -1378,23 +1406,3 @@ _PG_init(void)
 
        RegisterXactCallback(removeTable, NULL);
 }
-
-#if PG_VERSION_NUM < 150000
-void _PG_fini(void);
-void
-_PG_fini(void)
-{
-       ExecutorEnd_hook = oldExecutorEndHook;
-#if PG_VERSION_NUM >= 90200
-       ProcessUtility_hook = oldProcessUtilityHook;
-#endif
-
-       if (excludeTables.tables)
-               free(excludeTables.tables);
-       if (includeTables.tables)
-               free(includeTables.tables);
-
-       excludeTables.tables = includeTables.tables = NULL;
-       excludeTables.nTables = includeTables.nTables = 0;
-}
-#endif