external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2980 from citusdata/fix_2979 

Merge two conflicting pg_dist_object headers
pull/2981/head
Hadi Moshayedi 2019-09-16 12:44:36 -07:00 committed by GitHub
parent 72dd439ca7 964020097d
commit c0d736ce91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/distributed/metadata/pg_dist_object.h
View File

@ -49,12 +49,14 @@ typedef FormData_pg_dist_object *Form_pg_dist_object;
* compiler constants for pg_dist_object * compiler constants for pg_dist_object
* ---------------- * ----------------
*/ */
#define Natts_pg_dist_object 6 #define Natts_pg_dist_object 8
#define Anum_pg_dist_object_classid 1 #define Anum_pg_dist_object_classid 1
#define Anum_pg_dist_object_objid 2 #define Anum_pg_dist_object_objid 2
#define Anum_pg_dist_object_objsubid 3 #define Anum_pg_dist_object_objsubid 3
#define Anum_pg_dist_object_type 4 #define Anum_pg_dist_object_type 4
#define Anum_pg_dist_object_object_names 5 #define Anum_pg_dist_object_object_names 5
#define Anum_pg_dist_object_object_args 6 #define Anum_pg_dist_object_object_args 6
#define Anum_pg_dist_object_distribution_argument_index 7
#define Anum_pg_dist_object_colocationid 8
#endif /* PG_DIST_OBJECT_H */ #endif /* PG_DIST_OBJECT_H */

29
src/include/distributed/pg_dist_object.h
View File

@ -1,29 +0,0 @@
/*-------------------------------------------------------------------------
*
* pg_dist_object.h
* definition of the relation that holds the object information on the
* cluster (pg_dist_object).
*
* Copyright (c) 2019, Citus Data, Inc.
*
*-------------------------------------------------------------------------
*/
#ifndef PG_DIST_OBJECT_H
#define PG_DIST_OBJECT_H
/* ----------------
* compiler constants for pg_dist_object
* ----------------
*/
#define Natts_pg_dist_object 8
#define Anum_pg_dist_object_classid 1
#define Anum_pg_dist_object_objid 2
#define Anum_pg_dist_object_objsubid 3
#define Anum_pg_dist_object_type 4
#define Anum_pg_dist_object_object_names 5
#define Anum_pg_dist_object_object_args 6
#define Anum_pg_dist_object_distribution_arg_index 7
#define Anum_pg_dist_object_colocation_id 8
#endif /* PG_DIST_OBJECT_H */