mirror of
https://github.com/postgres/postgres.git
synced 2025-08-28 18:48:04 +03:00
Clean up ill-advised attempt to invent a private set of Node tags.
Somebody thought it'd be cute to invent a set of Node tag numbers that were defined independently of, and indeed conflicting with, the main tag-number list. While this accidentally failed to fail so far, it would certainly lead to trouble as soon as anyone wanted to, say, apply copyObject to these node types. Clang was already complaining about the use of makeNode on these tags, and I think quite rightly so. Fix by pushing these node definitions into the mainstream, including putting replnodes.h where it belongs.
This commit is contained in:
@@ -5,14 +5,14 @@
|
||||
*
|
||||
* Portions Copyright (c) 2010-2011, PostgreSQL Global Development Group
|
||||
*
|
||||
* src/include/replication/walsender.h
|
||||
* src/include/replication/basebackup.h
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
#ifndef _BASEBACKUP_H
|
||||
#define _BASEBACKUP_H
|
||||
|
||||
#include "replication/replnodes.h"
|
||||
#include "nodes/replnodes.h"
|
||||
|
||||
extern void SendBaseBackup(BaseBackupCmd *cmd);
|
||||
|
||||
|
@@ -1,62 +0,0 @@
|
||||
/*-------------------------------------------------------------------------
|
||||
*
|
||||
* replnodes.h
|
||||
* definitions for replication grammar parse nodes
|
||||
*
|
||||
*
|
||||
* Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* src/include/replication/replnodes.h
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
#ifndef REPLNODES_H
|
||||
#define REPLNODES_H
|
||||
|
||||
#include "access/xlogdefs.h"
|
||||
#include "nodes/primnodes.h"
|
||||
#include "nodes/value.h"
|
||||
|
||||
/*
|
||||
* NodeTags for replication parser
|
||||
*/
|
||||
typedef enum ReplNodeTag
|
||||
{
|
||||
T_IdentifySystemCmd = 10,
|
||||
T_BaseBackupCmd,
|
||||
T_StartReplicationCmd
|
||||
} ReplNodeTag;
|
||||
|
||||
/* ----------------------
|
||||
* IDENTIFY_SYSTEM command
|
||||
* ----------------------
|
||||
*/
|
||||
typedef struct IdentifySystemCmd
|
||||
{
|
||||
NodeTag type;
|
||||
} IdentifySystemCmd;
|
||||
|
||||
|
||||
/* ----------------------
|
||||
* BASE_BACKUP command
|
||||
* ----------------------
|
||||
*/
|
||||
typedef struct BaseBackupCmd
|
||||
{
|
||||
NodeTag type;
|
||||
List *options;
|
||||
} BaseBackupCmd;
|
||||
|
||||
|
||||
/* ----------------------
|
||||
* START_REPLICATION command
|
||||
* ----------------------
|
||||
*/
|
||||
typedef struct StartReplicationCmd
|
||||
{
|
||||
NodeTag type;
|
||||
XLogRecPtr startpoint;
|
||||
} StartReplicationCmd;
|
||||
|
||||
#endif /* REPLNODES_H */
|
Reference in New Issue
Block a user