database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-09 17:03:00 +03:00
Code Activity

Update this branch to match CVS head, includes WIN32 improvements.

Browse Source
This commit is contained in:
Bruce Momjian
2003-09-07 04:37:13 +00:00
parent 432ca9116b
commit c40ed51319
383 changed files with 82452 additions and 85073 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
contrib/tsearch2/rewrite.c
View File

@@ -177,6 +177,7 @@ clean_NOT_v2(ITEM * ptr, int4 *len)
#define V_UNKNOWN 0
#define V_TRUE 1
#define V_FALSE 2
#define V_STOP 3
/*
* Clean query tree from values which is always in
@@ -190,10 +191,10 @@ clean_fakeval_intree(NODE * node, char *result)
if (node->valnode->type == VAL)
return node;
else if (node->valnode->type == VALTRUE)
else if (node->valnode->type == VALSTOP)
{
pfree(node);
*result = V_TRUE;
*result = V_STOP;
return NULL;
}
@@ -203,65 +204,29 @@ clean_fakeval_intree(NODE * node, char *result)
node->right = clean_fakeval_intree(node->right, &rresult);
if (!node->right)
{
*result = (rresult == V_TRUE) ? V_FALSE : V_TRUE;
*result = V_STOP;
freetree(node);
return NULL;
}
}
else if (node->valnode->val == (int4) '|')
{
NODE *res = node;
node->left = clean_fakeval_intree(node->left, &lresult);
node->right = clean_fakeval_intree(node->right, &rresult);
if (lresult == V_TRUE || rresult == V_TRUE)
{
freetree(node);
*result = V_TRUE;
return NULL;
}
else if (lresult == V_FALSE && rresult == V_FALSE)
{
freetree(node);
*result = V_FALSE;
return NULL;
}
else if (lresult == V_FALSE)
{
res = node->right;
pfree(node);
}
else if (rresult == V_FALSE)
{
res = node->left;
pfree(node);
}
return res;
}
else
{
NODE *res = node;
node->left = clean_fakeval_intree(node->left, &lresult);
node->right = clean_fakeval_intree(node->right, &rresult);
if (lresult == V_FALSE || rresult == V_FALSE)
if (lresult == V_STOP && rresult == V_STOP)
{
freetree(node);
*result = V_FALSE;
*result = V_STOP;
return NULL;
}
else if (lresult == V_TRUE && rresult == V_TRUE)
{
freetree(node);
*result = V_TRUE;
return NULL;
}
else if (lresult == V_TRUE)
else if (lresult == V_STOP)
{
res = node->right;
pfree(node);
}
else if (rresult == V_TRUE)
else if (rresult == V_STOP)
{
res = node->left;
pfree(node);