Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
353d36f9
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
353d36f9
编写于
5月 18, 1999
作者:
T
Tom Lane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove no-longer-used fields in Hash and HashJoin nodes.
上级
26069a58
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
87 deletion
+21
-87
src/backend/nodes/copyfuncs.c
src/backend/nodes/copyfuncs.c
+1
-9
src/backend/nodes/outfuncs.c
src/backend/nodes/outfuncs.c
+4
-12
src/backend/nodes/readfuncs.c
src/backend/nodes/readfuncs.c
+1
-25
src/backend/optimizer/plan/createplan.c
src/backend/optimizer/plan/createplan.c
+1
-7
src/include/nodes/execnodes.h
src/include/nodes/execnodes.h
+13
-27
src/include/nodes/plannodes.h
src/include/nodes/plannodes.h
+1
-7
未找到文件。
src/backend/nodes/copyfuncs.c
浏览文件 @
353d36f9
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.
79 1999/05/12 15:01:31 wieck
Exp $
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.
80 1999/05/18 21:34:27 tgl
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -357,10 +357,6 @@ _copyHashJoin(HashJoin *from)
...
@@ -357,10 +357,6 @@ _copyHashJoin(HashJoin *from)
newnode
->
hashjoinop
=
from
->
hashjoinop
;
newnode
->
hashjoinop
=
from
->
hashjoinop
;
/* both are unused !.. */
newnode
->
hashjointablekey
=
from
->
hashjointablekey
;
newnode
->
hashjointablesize
=
from
->
hashjointablesize
;
return
newnode
;
return
newnode
;
}
}
...
@@ -545,10 +541,6 @@ _copyHash(Hash *from)
...
@@ -545,10 +541,6 @@ _copyHash(Hash *from)
*/
*/
Node_Copy
(
from
,
newnode
,
hashkey
);
Node_Copy
(
from
,
newnode
,
hashkey
);
/* both are unused !.. */
newnode
->
hashtablekey
=
from
->
hashtablekey
;
newnode
->
hashtablesize
=
from
->
hashtablesize
;
return
newnode
;
return
newnode
;
}
}
...
...
src/backend/nodes/outfuncs.c
浏览文件 @
353d36f9
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
*
*
* Copyright (c) 1994, Regents of the University of California
* Copyright (c) 1994, Regents of the University of California
*
*
* $Id: outfuncs.c,v 1.8
2 1999/05/17 17:03:13 momjian
Exp $
* $Id: outfuncs.c,v 1.8
3 1999/05/18 21:34:28 tgl
Exp $
*
*
* NOTES
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
* Every (plan) node in POSTGRES has an associated "out" routine which
...
@@ -385,14 +385,11 @@ _outHashJoin(StringInfo str, HashJoin *node)
...
@@ -385,14 +385,11 @@ _outHashJoin(StringInfo str, HashJoin *node)
_outNode
(
str
,
node
->
hashclauses
);
_outNode
(
str
,
node
->
hashclauses
);
appendStringInfo
(
str
,
appendStringInfo
(
str
,
" :hashjoinop %u :hashjointable 0x%x :hashjointablekey %d "
,
" :hashjoinop %u "
,
node
->
hashjoinop
,
node
->
hashjoinop
);
(
int
)
node
->
hashjointable
,
node
->
hashjointablekey
);
appendStringInfo
(
str
,
appendStringInfo
(
str
,
" :hashjointablesize %d :hashdone %d "
,
" :hashdone %d "
,
node
->
hashjointablesize
,
node
->
hashdone
);
node
->
hashdone
);
}
}
...
@@ -536,11 +533,6 @@ _outHash(StringInfo str, Hash *node)
...
@@ -536,11 +533,6 @@ _outHash(StringInfo str, Hash *node)
appendStringInfo
(
str
,
" :hashkey "
);
appendStringInfo
(
str
,
" :hashkey "
);
_outNode
(
str
,
node
->
hashkey
);
_outNode
(
str
,
node
->
hashkey
);
appendStringInfo
(
str
,
" :hashtable 0x%x :hashtablekey %d :hashtablesize %d "
,
(
int
)
node
->
hashtable
,
node
->
hashtablekey
,
node
->
hashtablesize
);
}
}
/*****************************************************************************
/*****************************************************************************
...
...
src/backend/nodes/readfuncs.c
浏览文件 @
353d36f9
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.6
2 1999/05/17 17:03:14 momjian
Exp $
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.6
3 1999/05/18 21:34:29 tgl
Exp $
*
*
* NOTES
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
* Most of the read functions for plan nodes are tested. (In fact, they
...
@@ -454,18 +454,6 @@ _readHashJoin()
...
@@ -454,18 +454,6 @@ _readHashJoin()
token
=
lsptok
(
NULL
,
&
length
);
/* get hashjoinop */
token
=
lsptok
(
NULL
,
&
length
);
/* get hashjoinop */
local_node
->
hashjoinop
=
strtoul
(
token
,
NULL
,
10
);
local_node
->
hashjoinop
=
strtoul
(
token
,
NULL
,
10
);
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashjointable */
token
=
lsptok
(
NULL
,
&
length
);
/* eat hashjointable */
local_node
->
hashjointable
=
NULL
;
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashjointablekey */
token
=
lsptok
(
NULL
,
&
length
);
/* eat hashjointablekey */
local_node
->
hashjointablekey
=
0
;
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashjointablesize */
token
=
lsptok
(
NULL
,
&
length
);
/* eat hashjointablesize */
local_node
->
hashjointablesize
=
0
;
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashdone */
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashdone */
token
=
lsptok
(
NULL
,
&
length
);
/* eat hashdone */
token
=
lsptok
(
NULL
,
&
length
);
/* eat hashdone */
local_node
->
hashdone
=
false
;
local_node
->
hashdone
=
false
;
...
@@ -680,18 +668,6 @@ _readHash()
...
@@ -680,18 +668,6 @@ _readHash()
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashkey */
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashkey */
local_node
->
hashkey
=
(
Var
*
)
nodeRead
(
true
);
local_node
->
hashkey
=
(
Var
*
)
nodeRead
(
true
);
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashtable */
token
=
lsptok
(
NULL
,
&
length
);
/* eat hashtable address */
local_node
->
hashtable
=
NULL
;
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashtablekey */
token
=
lsptok
(
NULL
,
&
length
);
/* get hashtablekey */
local_node
->
hashtablekey
=
0
;
token
=
lsptok
(
NULL
,
&
length
);
/* eat :hashtablesize */
token
=
lsptok
(
NULL
,
&
length
);
/* get hashtablesize */
local_node
->
hashtablesize
=
0
;
return
local_node
;
return
local_node
;
}
}
...
...
src/backend/optimizer/plan/createplan.c
浏览文件 @
353d36f9
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
*
*
* IDENTIFICATION
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.5
4 1999/05/10 00:45:19 momjian
Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.5
5 1999/05/18 21:34:29 tgl
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -1050,9 +1050,6 @@ make_hashjoin(List *tlist,
...
@@ -1050,9 +1050,6 @@ make_hashjoin(List *tlist,
plan
->
lefttree
=
lefttree
;
plan
->
lefttree
=
lefttree
;
plan
->
righttree
=
righttree
;
plan
->
righttree
=
righttree
;
node
->
hashclauses
=
hashclauses
;
node
->
hashclauses
=
hashclauses
;
node
->
hashjointable
=
NULL
;
node
->
hashjointablekey
=
0
;
node
->
hashjointablesize
=
0
;
node
->
hashdone
=
false
;
node
->
hashdone
=
false
;
return
node
;
return
node
;
...
@@ -1071,9 +1068,6 @@ make_hash(List *tlist, Var *hashkey, Plan *lefttree)
...
@@ -1071,9 +1068,6 @@ make_hash(List *tlist, Var *hashkey, Plan *lefttree)
plan
->
lefttree
=
lefttree
;
plan
->
lefttree
=
lefttree
;
plan
->
righttree
=
NULL
;
plan
->
righttree
=
NULL
;
node
->
hashkey
=
hashkey
;
node
->
hashkey
=
hashkey
;
node
->
hashtable
=
NULL
;
node
->
hashtablekey
=
0
;
node
->
hashtablesize
=
0
;
return
node
;
return
node
;
}
}
...
...
src/include/nodes/execnodes.h
浏览文件 @
353d36f9
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
*
*
* Copyright (c) 1994, Regents of the University of California
* Copyright (c) 1994, Regents of the University of California
*
*
* $Id: execnodes.h,v 1.2
7 1999/03/23 16:51:00 momjian
Exp $
* $Id: execnodes.h,v 1.2
8 1999/05/18 21:34:26 tgl
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -492,24 +492,16 @@ typedef struct MergeJoinState
...
@@ -492,24 +492,16 @@ typedef struct MergeJoinState
/* ----------------
/* ----------------
* HashJoinState information
* HashJoinState information
*
*
* hj_HashTable address of the hash table for the hashjoin
* hj_HashTable hash table for the hashjoin
* hj_HashTableShmId shared memory id of hash table
* hj_CurBucketNo bucket# for current outer tuple
* hj_CurBucket the current hash bucket that we are searching
* hj_CurTuple last inner tuple matched to current outer
* for matches of the current outer tuple
* tuple, or NULL if starting search
* hj_CurTuple the current matching inner tuple in the
* (CurBucketNo and CurTuple are meaningless
* current hash bucket
* unless OuterTupleSlot is nonempty!)
* hj_CurOTuple the current matching inner tuple in the
* current hash overflow chain
* hj_InnerHashKey the inner hash key in the hashjoin condition
* hj_InnerHashKey the inner hash key in the hashjoin condition
* hj_OuterBatches file descriptors for outer batches
* hj_InnerBatches file descriptors for inner batches
* hj_OuterReadPos current read position of outer batch
* hj_OuterReadBlk current read block of outer batch
* hj_OuterTupleSlot tuple slot for outer tuples
* hj_OuterTupleSlot tuple slot for outer tuples
* hj_HashTupleSlot tuple slot for hashed tuples
* hj_HashTupleSlot tuple slot for hashed tuples
*
*
*
*
* JoinState information
* JoinState information
*
*
* CommonState information
* CommonState information
...
@@ -525,16 +517,10 @@ typedef struct MergeJoinState
...
@@ -525,16 +517,10 @@ typedef struct MergeJoinState
typedef
struct
HashJoinState
typedef
struct
HashJoinState
{
{
JoinState
jstate
;
/* its first field is NodeTag */
JoinState
jstate
;
/* its first field is NodeTag */
HashJoinTable
hj_HashTable
;
HashJoinTable
hj_HashTable
;
IpcMemoryId
hj_HashTableShmId
;
int
hj_CurBucketNo
;
HashBucket
hj_CurBucket
;
HashJoinTuple
hj_CurTuple
;
HeapTuple
hj_CurTuple
;
Var
*
hj_InnerHashKey
;
OverflowTuple
hj_CurOTuple
;
Var
*
hj_InnerHashKey
;
File
*
hj_OuterBatches
;
File
*
hj_InnerBatches
;
char
*
hj_OuterReadPos
;
int
hj_OuterReadBlk
;
TupleTableSlot
*
hj_OuterTupleSlot
;
TupleTableSlot
*
hj_OuterTupleSlot
;
TupleTableSlot
*
hj_HashTupleSlot
;
TupleTableSlot
*
hj_HashTupleSlot
;
}
HashJoinState
;
}
HashJoinState
;
...
@@ -668,7 +654,7 @@ typedef CommonState UniqueState;
...
@@ -668,7 +654,7 @@ typedef CommonState UniqueState;
/* ----------------
/* ----------------
* HashState information
* HashState information
*
*
* hash
Batches file descriptors for the batches
* hash
table hash table for the hashjoin
*
*
* CommonState information
* CommonState information
*
*
...
@@ -683,7 +669,7 @@ typedef CommonState UniqueState;
...
@@ -683,7 +669,7 @@ typedef CommonState UniqueState;
typedef
struct
HashState
typedef
struct
HashState
{
{
CommonState
cstate
;
/* its first field is NodeTag */
CommonState
cstate
;
/* its first field is NodeTag */
File
*
hashBatches
;
HashJoinTable
hashtable
;
}
HashState
;
}
HashState
;
#ifdef NOT_USED
#ifdef NOT_USED
...
...
src/include/nodes/plannodes.h
浏览文件 @
353d36f9
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
*
*
* Copyright (c) 1994, Regents of the University of California
* Copyright (c) 1994, Regents of the University of California
*
*
* $Id: plannodes.h,v 1.2
4 1999/03/23 16:51:04 momjian
Exp $
* $Id: plannodes.h,v 1.2
5 1999/05/18 21:34:26 tgl
Exp $
*
*
*-------------------------------------------------------------------------
*-------------------------------------------------------------------------
*/
*/
...
@@ -221,9 +221,6 @@ typedef struct HashJoin
...
@@ -221,9 +221,6 @@ typedef struct HashJoin
List
*
hashclauses
;
List
*
hashclauses
;
Oid
hashjoinop
;
Oid
hashjoinop
;
HashJoinState
*
hashjoinstate
;
HashJoinState
*
hashjoinstate
;
HashJoinTable
hashjointable
;
IpcMemoryKey
hashjointablekey
;
int
hashjointablesize
;
bool
hashdone
;
bool
hashdone
;
}
HashJoin
;
}
HashJoin
;
...
@@ -320,9 +317,6 @@ typedef struct Hash
...
@@ -320,9 +317,6 @@ typedef struct Hash
Plan
plan
;
Plan
plan
;
Var
*
hashkey
;
Var
*
hashkey
;
HashState
*
hashstate
;
HashState
*
hashstate
;
HashJoinTable
hashtable
;
IpcMemoryKey
hashtablekey
;
int
hashtablesize
;
}
Hash
;
}
Hash
;
#ifdef NOT_USED
#ifdef NOT_USED
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录