mirror of https://github.com/citusdata/citus.git
Remove references to citus_columnar extension in utility hook and dependency checks
parent
b09dae0dab
commit
67ca0cda1a
|
@ -212,7 +212,7 @@ citus_ProcessUtility(PlannedStmt *pstmt,
|
||||||
* Postgres forbids creating/altering other extensions from within an extension script, so we use a utility hook instead
|
* Postgres forbids creating/altering other extensions from within an extension script, so we use a utility hook instead
|
||||||
* This preprocess check whether citus_columnar should be installed first before citus
|
* This preprocess check whether citus_columnar should be installed first before citus
|
||||||
*/
|
*/
|
||||||
PreprocessCreateExtensionStmtForCitusColumnar(parsetree);
|
// PreprocessCreateExtensionStmtForCitusColumnar(parsetree);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isCreateAlterExtensionUpdateCitusStmt || IsDropCitusExtensionStmt(parsetree))
|
if (isCreateAlterExtensionUpdateCitusStmt || IsDropCitusExtensionStmt(parsetree))
|
||||||
|
@ -797,7 +797,7 @@ citus_ProcessUtilityInternal(PlannedStmt *pstmt,
|
||||||
* or drop citus_columnar fake version when downgrade citus to older version that do not support
|
* or drop citus_columnar fake version when downgrade citus to older version that do not support
|
||||||
* citus_columnar
|
* citus_columnar
|
||||||
*/
|
*/
|
||||||
PostprocessAlterExtensionCitusStmtForCitusColumnar(parsetree);
|
// PostprocessAlterExtensionCitusStmtForCitusColumnar(parsetree);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1233,10 +1233,10 @@ bool
|
||||||
IsObjectAddressOwnedByCitus(const ObjectAddress *objectAddress)
|
IsObjectAddressOwnedByCitus(const ObjectAddress *objectAddress)
|
||||||
{
|
{
|
||||||
Oid citusId = get_extension_oid("citus", true);
|
Oid citusId = get_extension_oid("citus", true);
|
||||||
Oid citusColumnarId = get_extension_oid("citus_columnar", true);
|
// Oid citusColumnarId = get_extension_oid("citus_columnar", true);
|
||||||
|
|
||||||
/* return false because we could not find any citus extension */
|
/* return false because we could not find any citus extension */
|
||||||
if (!OidIsValid(citusId) && !OidIsValid(citusColumnarId))
|
if (!OidIsValid(citusId))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -1250,9 +1250,8 @@ IsObjectAddressOwnedByCitus(const ObjectAddress *objectAddress)
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ownedByCitus = extObjectAddress.objectId == citusId;
|
bool ownedByCitus = extObjectAddress.objectId == citusId;
|
||||||
bool ownedByCitusColumnar = extObjectAddress.objectId == citusColumnarId;
|
|
||||||
|
|
||||||
return ownedByCitus || ownedByCitusColumnar;
|
return ownedByCitus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue