remove useless and obsolete functions, fix format string in pathman_workers.c

funbringer · funbringer · commit f19a764861f4 · 2016-10-18T19:26:57.000+03:00
diff --git a/src/pathman_workers.c b/src/pathman_workers.c
@@ -540,7 +540,7 @@ bgw_main_concurrent_part(Datum main_arg)
 			part_slot->total_rows += rows;
 /* Report debug message */
 #ifdef USE_ASSERT_CHECKING
-			elog(DEBUG1, "%s: relocated %d rows, total: %lu [%u]",
+			elog(DEBUG1, "%s: relocated %d rows, total: " UINT64_FORMAT " [%u]",
 				 concurrent_part_bgw, rows, part_slot->total_rows, MyProcPid);
 #endif
 			SpinLockRelease(&part_slot->mutex);
diff --git a/src/utils.c b/src/utils.c
@@ -176,65 +176,6 @@ bms_print(Bitmapset *bms)
   return str.data;
 }
 
-/*
- * Copied from util/plancat.c
- *
- * Build a targetlist representing the columns of the specified index.
- */
-List *
-build_index_tlist(PlannerInfo *root, IndexOptInfo *index,
-				  Relation heapRelation)
-{
-	List	   *tlist = NIL;
-	Index		varno = index->rel->relid;
-	ListCell   *indexpr_item;
-	int			i;
-
-	indexpr_item = list_head(index->indexprs);
-	for (i = 0; i < index->ncolumns; i++)
-	{
-		int			indexkey = index->indexkeys[i];
-		Expr	   *indexvar;
-
-		if (indexkey != 0)
-		{
-			/* simple column */
-			Form_pg_attribute att_tup;
-
-			if (indexkey < 0)
-				att_tup = SystemAttributeDefinition(indexkey,
-										   heapRelation->rd_rel->relhasoids);
-			else
-				att_tup = heapRelation->rd_att->attrs[indexkey - 1];
-
-			indexvar = (Expr *) makeVar(varno,
-										indexkey,
-										att_tup->atttypid,
-										att_tup->atttypmod,
-										att_tup->attcollation,
-										0);
-		}
-		else
-		{
-			/* expression column */
-			if (indexpr_item == NULL)
-				elog(ERROR, "wrong number of index expressions");
-			indexvar = (Expr *) lfirst(indexpr_item);
-			indexpr_item = lnext(indexpr_item);
-		}
-
-		tlist = lappend(tlist,
-						makeTargetEntry(indexvar,
-										i + 1,
-										NULL,
-										false));
-	}
-	if (indexpr_item != NULL)
-		elog(ERROR, "wrong number of index expressions");
-
-	return tlist;
-}
-
 /*
  * Get BTORDER_PROC for two types described by Oids
  */
@@ -583,16 +524,6 @@ is_date_type_internal(Oid typid)
 		   typid == DATEOID;
 }
 
-/*
- * Check if this is a string type.
- */
-bool
-is_string_type_internal(Oid typid)
-{
-	return typid == TEXTOID ||
-		   typid == CSTRINGOID;
-}
-
 
 /*
  * Try to find binary operator.
@@ -652,20 +583,6 @@ get_rel_name_or_relid(Oid relid)
 	return relname;
 }
 
-/*
- * Try to get opname or at least opid as cstring.
- */
-char *
-get_op_name_or_opid(Oid opid)
-{
-	char *opname = get_opname(opid);
-
-	if (!opname)
-		return DatumGetCString(DirectFunctionCall1(oidout,
-												   ObjectIdGetDatum(opid)));
-	return opname;
-}
-
 
 #if PG_VERSION_NUM < 90600
 /*
diff --git a/src/utils.h b/src/utils.h
@@ -32,9 +32,6 @@ typedef struct
 void plan_tree_walker(Plan *plan,
 					  void (*visitor) (Plan *plan, void *context),
 					  void *context);
-List * build_index_tlist(PlannerInfo *root,
-						 IndexOptInfo *index,
-						 Relation heapRelation);
 void change_varnos(Node *node, Oid old_varno, Oid new_varno);
 
 /*
@@ -48,7 +45,6 @@ void postprocess_lock_rows(List *rtable, Plan *plan);
  */
 bool clause_contains_params(Node *clause);
 bool is_date_type_internal(Oid typid);
-bool is_string_type_internal(Oid typid);
 bool validate_on_part_init_cb(Oid procid, bool emit_error);
 bool check_security_policy_internal(Oid relid, Oid role);
 
@@ -67,8 +63,6 @@ Oid get_rel_owner(Oid relid);
  * Handy execution-stage functions.
  */
 char * get_rel_name_or_relid(Oid relid);
-char * get_op_name_or_opid(Oid opid);
-
 Oid get_binary_operator_oid(char *opname, Oid arg1, Oid arg2);
 void fill_type_cmp_fmgr_info(FmgrInfo *finfo,
 							 Oid type1,
