diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2019-02-01 12:50:32 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2019-02-01 12:50:32 -0300 |
| commit | 558d77f20e4e9ed18101d5d057b770ae22ece855 (patch) | |
| tree | c65b6dff674f7f6a46a391683e281a51839162c1 /src/backend/jit/llvm | |
| parent | f831d4accda00b9144bc647ede2e2f848b59f39d (diff) | |
| download | postgresql-558d77f20e4e9ed18101d5d057b770ae22ece855.tar.gz postgresql-558d77f20e4e9ed18101d5d057b770ae22ece855.zip | |
Renaming for new subscripting mechanism
Over at patch https://commitfest.postgresql.org/21/1062/ Dmitry wants to
introduce a more generic subscription mechanism, which allows
subscripting not only arrays but also other object types such as JSONB.
That functionality is introduced in a largish invasive patch, out of
which this internal renaming patch was extracted.
Author: Dmitry Dolgov
Reviewed-by: Tom Lane, Arthur Zakirov
Discussion: https://postgr.es/m/CA+q6zcUK4EqPAu7XRRO5CCjMwhz5zvg+rfWuLzVoxp_5sKS6=w@mail.gmail.com
Diffstat (limited to 'src/backend/jit/llvm')
| -rw-r--r-- | src/backend/jit/llvm/llvmjit.c | 4 | ||||
| -rw-r--r-- | src/backend/jit/llvm/llvmjit_expr.c | 18 | ||||
| -rw-r--r-- | src/backend/jit/llvm/llvmjit_types.c | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c index c4d38a64a44..82c4afb7011 100644 --- a/src/backend/jit/llvm/llvmjit.c +++ b/src/backend/jit/llvm/llvmjit.c @@ -85,7 +85,7 @@ LLVMValueRef FuncVarsizeAny; LLVMValueRef FuncSlotGetsomeattrsInt; LLVMValueRef FuncSlotGetmissingattrs; LLVMValueRef FuncMakeExpandedObjectReadOnlyInternal; -LLVMValueRef FuncExecEvalArrayRefSubscript; +LLVMValueRef FuncExecEvalSubscriptingRef; LLVMValueRef FuncExecEvalSysVar; LLVMValueRef FuncExecAggTransReparent; LLVMValueRef FuncExecAggInitGroup; @@ -829,7 +829,7 @@ llvm_create_types(void) FuncSlotGetsomeattrsInt = LLVMGetNamedFunction(mod, "slot_getsomeattrs_int"); FuncSlotGetmissingattrs = LLVMGetNamedFunction(mod, "slot_getmissingattrs"); FuncMakeExpandedObjectReadOnlyInternal = LLVMGetNamedFunction(mod, "MakeExpandedObjectReadOnlyInternal"); - FuncExecEvalArrayRefSubscript = LLVMGetNamedFunction(mod, "ExecEvalArrayRefSubscript"); + FuncExecEvalSubscriptingRef = LLVMGetNamedFunction(mod, "ExecEvalSubscriptingRef"); FuncExecEvalSysVar = LLVMGetNamedFunction(mod, "ExecEvalSysVar"); FuncExecAggTransReparent = LLVMGetNamedFunction(mod, "ExecAggTransReparent"); FuncExecAggInitGroup = LLVMGetNamedFunction(mod, "ExecAggInitGroup"); diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c index df7e620da71..1bb58e3e61a 100644 --- a/src/backend/jit/llvm/llvmjit_expr.c +++ b/src/backend/jit/llvm/llvmjit_expr.c @@ -1144,20 +1144,20 @@ llvm_compile_expr(ExprState *state) break; } - case EEOP_ARRAYREF_OLD: - build_EvalXFunc(b, mod, "ExecEvalArrayRefOld", + case EEOP_SBSREF_OLD: + build_EvalXFunc(b, mod, "ExecEvalSubscriptingRefOld", v_state, v_econtext, op); LLVMBuildBr(b, opblocks[i + 1]); break; - case EEOP_ARRAYREF_ASSIGN: - build_EvalXFunc(b, mod, "ExecEvalArrayRefAssign", + case EEOP_SBSREF_ASSIGN: + build_EvalXFunc(b, mod, "ExecEvalSubscriptingRefAssign", v_state, v_econtext, op); LLVMBuildBr(b, opblocks[i + 1]); break; - case EEOP_ARRAYREF_FETCH: - build_EvalXFunc(b, mod, "ExecEvalArrayRefFetch", + case EEOP_SBSREF_FETCH: + build_EvalXFunc(b, mod, "ExecEvalSubscriptingRefFetch", v_state, v_econtext, op); LLVMBuildBr(b, opblocks[i + 1]); break; @@ -1775,14 +1775,14 @@ llvm_compile_expr(ExprState *state) LLVMBuildBr(b, opblocks[i + 1]); break; - case EEOP_ARRAYREF_SUBSCRIPT: + case EEOP_SBSREF_SUBSCRIPT: { LLVMValueRef v_fn; - int jumpdone = op->d.arrayref_subscript.jumpdone; + int jumpdone = op->d.sbsref_subscript.jumpdone; LLVMValueRef v_params[2]; LLVMValueRef v_ret; - v_fn = llvm_get_decl(mod, FuncExecEvalArrayRefSubscript); + v_fn = llvm_get_decl(mod, FuncExecEvalSubscriptingRef); v_params[0] = v_state; v_params[1] = l_ptr_const(op, l_ptr(StructExprEvalStep)); diff --git a/src/backend/jit/llvm/llvmjit_types.c b/src/backend/jit/llvm/llvmjit_types.c index c814bc7b3ee..9522b972c1a 100644 --- a/src/backend/jit/llvm/llvmjit_types.c +++ b/src/backend/jit/llvm/llvmjit_types.c @@ -103,7 +103,7 @@ void *referenced_functions[] = slot_getsomeattrs_int, slot_getmissingattrs, MakeExpandedObjectReadOnlyInternal, - ExecEvalArrayRefSubscript, + ExecEvalSubscriptingRef, ExecEvalSysVar, ExecAggTransReparent, ExecAggInitGroup |