fix compiler warnings

feodor · feodor · commit 80deea9e5463 · 2014-08-27T20:47:16.000+04:00
diff --git a/jsquery_extract.c b/jsquery_extract.c
@@ -628,15 +628,13 @@ setSelectivityClass(ExtractedNode *node, CheckEntryHandler checkHandler,
 {
 	int					i;
 	bool				first;
-	bool				skip;
 	ExtractedNode	   *child;
 
 	switch(node->type)
 	{
 		case eAnd:
 		case eOr:
 			first = true;
-			skip = false;
 			node->forceIndex = false;
 			for (i = 0; i < node->args.count; i++)
 			{
@@ -649,10 +647,7 @@ setSelectivityClass(ExtractedNode *node, CheckEntryHandler checkHandler,
 				{
 					if (child->hint == jsqNoIndex ||
 							!checkHandler(child, extra))
-					{
-						skip = true;
 						continue;
-					}
 				}
 
 				setSelectivityClass(child, checkHandler, extra);
@@ -673,11 +668,13 @@ setSelectivityClass(ExtractedNode *node, CheckEntryHandler checkHandler,
 				}
 				first = false;
 			}
-			return;
+			break;
 		case eScalar:
 			node->sClass = getScalarSelectivityClass(node);
 			node->forceIndex = node->hint == jsqForceIndex;
-			return;
+			break;
+		default:
+			elog(ERROR,"Wrong node type");
 	}
 }
 
@@ -724,6 +721,8 @@ execRecursive(ExtractedNode *node, bool *check)
 			return false;
 		case eScalar:
 			return check[node->bounds.entryNum];
+		default:
+			elog(ERROR,"Wrong node type");
 	}
 }
 
@@ -762,6 +761,8 @@ execRecursiveTristate(ExtractedNode *node, GinTernaryValue *check)
 			return res;
 		case eScalar:
 			return check[node->bounds.entryNum];
+		default:
+			elog(ERROR,"Wrong node type");
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -628,15 +628,13 @@ setSelectivityClass(ExtractedNode *node, CheckEntryHandler checkHandler,`
`628`	`628`	`{`
`629`	`629`	`int i;`
`630`	`630`	`bool first;`
`631`		`- bool skip;`
`632`	`631`	`ExtractedNode *child;`
`633`	`632`
`634`	`633`	`switch(node->type)`
`635`	`634`	`{`
`636`	`635`	`case eAnd:`
`637`	`636`	`case eOr:`
`638`	`637`	`first = true;`
`639`		`- skip = false;`
`640`	`638`	`node->forceIndex = false;`
`641`	`639`	`for (i = 0; i < node->args.count; i++)`
`642`	`640`	`{`
`@@ -649,10 +647,7 @@ setSelectivityClass(ExtractedNode *node, CheckEntryHandler checkHandler,`
`649`	`647`	`{`
`650`	`648`	`if (child->hint == jsqNoIndex \|\|`
`651`	`649`	`!checkHandler(child, extra))`
`652`		`- {`
`653`		`- skip = true;`
`654`	`650`	`continue;`
`655`		`- }`
`656`	`651`	`}`
`657`	`652`
`658`	`653`	`setSelectivityClass(child, checkHandler, extra);`
`@@ -673,11 +668,13 @@ setSelectivityClass(ExtractedNode *node, CheckEntryHandler checkHandler,`
`673`	`668`	`}`
`674`	`669`	`first = false;`
`675`	`670`	`}`
`676`		`- return;`
	`671`	`+ break;`
`677`	`672`	`case eScalar:`
`678`	`673`	`node->sClass = getScalarSelectivityClass(node);`
`679`	`674`	`node->forceIndex = node->hint == jsqForceIndex;`
`680`		`- return;`
	`675`	`+ break;`
	`676`	`+ default:`
	`677`	`+ elog(ERROR,"Wrong node type");`
`681`	`678`	`}`
`682`	`679`	`}`
`683`	`680`
`@@ -724,6 +721,8 @@ execRecursive(ExtractedNode node, bool check)`
`724`	`721`	`return false;`
`725`	`722`	`case eScalar:`
`726`	`723`	`return check[node->bounds.entryNum];`
	`724`	`+ default:`
	`725`	`+ elog(ERROR,"Wrong node type");`
`727`	`726`	`}`
`728`	`727`	`}`
`729`	`728`
`@@ -762,6 +761,8 @@ execRecursiveTristate(ExtractedNode node, GinTernaryValue check)`
`762`	`761`	`return res;`
`763`	`762`	`case eScalar:`
`764`	`763`	`return check[node->bounds.entryNum];`
	`764`	`+ default:`
	`765`	`+ elog(ERROR,"Wrong node type");`
`765`	`766`	`}`
`766`	`767`	`}`
`767`	`768`