[CBRD-25719] Fix an issue where [user_schema] was incorrectly stored or missing in the condition and action_definition columns of the db_trigger catalog during trigger creation or loaddb execution with legacy unload files #5729

jongmin-won · 2024-12-19T12:11:02Z

http://jira.cubrid.org/browse/CBRD-25719

Purpose

CREATE TRIGGER 실행 시, SP가 포함된 경우 db_trigger 카탈로그의 action 및 condition 컬럼에 [user_schema]가 추가되지 않는 문제를 수정합니다.
과거의 unload 파일을 loaddb --no-user-specified-name 유틸리티를 사용해 트리거를 생성할 때, 실제 소유자를 찾아 db_trigger 카탈로그에 저장하도록 수정합니다.

Implementation

CREATE TRIGGER 동작 순서 수정

Trigger 구문

CREATE TRIGGER [example]
BEFORE UPDATE ON [history](score)
EXECUTE INSERT INTO [update_logs] VALUES ([obj].[event_code], [obj].[score], '2024-12-11');

Trigger 파싱 이후, Query Rewrite 수행 결과

insert into [dba.update_logs] values ([obj].[event_code], [obj].[score], '2024-12-11')

Action(PT_SCOPE) 파싱 결과

수정 전: 아래 SCOPE 구문이 에러 없이 정상적으로 컴파일된 경우, 2번에서 Rewrite된 구문을 카탈로그에 저장함.

SCOPE___ insert into [dba.update_logs] values ([obj].[event_code], [obj].[score], '2024-12-11') FROM ON  [public.history] obj, [public.history] new

Action(PT_SCOPE)파싱 이후, Query Rewrite 수행 결과 (추가된 부분)

수정 후: Action(PT_SCOPE) 파싱 결과를 다시 Rewrite하여 나온 구문을 카탈로그에 저장함.

insert into [dba.update_logs] ([event_code], [score], [dt]) values ([obj].[event_code], [obj].[score], '2024-12-11')

Remarks

N/A

…ondition columns of the db_trigger catalog when SP is included when performing create trigger, 2. When creating a trigger with the loaddb --no-user-specified-name utility, find the actual owner and modify it to save it in the db_trigger catalog, 3. When performing the unload utility, remove the owner’s [user_schema] from the action and condition columns.

…s the unload utility.

…en into an unexecutable rewrite query.

… rewritten into an unexecutable rewrite query.

…rewritten into an unexecutable rewrite query.

… rewritten into an unexecutable rewrite query.

…rewritten into an unexecutable rewrite query.

…s rewritten into an unexecutable rewrite query.

…ory management issue in the change_trigger_action_query function might be the cause and have made adjustments to address it.

…null.

ctshim · 2024-12-24T04:18:18Z

src/parser/compile.c

+      char *p = NULL;
+      const char *remove_eval_prefix = "evaluate (";
+      size_t remove_eval_suffix_len;
+
+      p = strstr (result, remove_eval_prefix);
+      if (p != NULL)
+	{
+	  p = (char *) memmove (p, p + strlen (remove_eval_prefix), strlen (p) - strlen (remove_eval_prefix) + 1);
+	}
+
+      remove_eval_suffix_len = strlen (p);
+      if (remove_eval_suffix_len > 0 && p[remove_eval_suffix_len - 1] == ')')
+	{
+	  p[remove_eval_suffix_len - 1] = '\0';
+	}


PR #5731 에서 다루는 코드와 동일한 것 같은데 함수로 만들어서 동일하게 유지 하는 것이 좋을 듯 합니다.

코드 리뷰 감사합니다.
관련 부분은 PR #5731 에서 remove_appended_trigger_evaluate () 함수를 추가 했습니다.

src/parser/compile.c

ctshim · 2024-12-24T04:37:13Z

src/parser/compile.c

+      free_and_init (*new_trigger_stmt);
+      *new_trigger_stmt = strdup (new_trigger_stmt_str);
+      free_and_init (new_trigger_stmt_str);


제가 위쪽에서 단 코멘트 중에 "return result; 로 충분할 듯 합니다." 이러 내용이 있었는데요,
그 코드를 수정하지 않는다면 반대로 이 부분에서 단지 아래와 같은 한 줄만 사용하면 될 것 같습니다.

*new_trigger_stmt = new_trigger_stmt_str;

코드 리뷰 감사합니다.
말씀하신 부분을 반영하여 수정했습니다.

beyondykk9 · 2024-12-24T07:02:35Z

src/parser/parse_tree_cl.c

@@ -11663,6 +11663,12 @@ pt_print_expr (PARSER_CONTEXT * parser, PT_NODE * p)
 	}
      else
 	{
+	  if (parser->flag.is_parsing_trigger == 1 && p->info.expr.flag != 0)


Suggested change

if (parser->flag.is_parsing_trigger == 1 && p->info.expr.flag != 0)

if (parser->flag.is_parsing_trigger && p->info.expr.flag)

코드 리뷰 감사합니다.
말씀하신 부분을 반영하여 수정했습니다.

beyondykk9 · 2024-12-24T07:04:36Z

src/parser/parse_tree_cl.c

@@ -13020,7 +13026,7 @@ pt_print_insert (PARSER_CONTEXT * parser, PT_NODE * p)

  // TODO: [PL/CSQL] need refactoring
  unsigned int save_custom = parser->custom_print;
-  if (parser->flag.is_parsing_static_sql == 1)
+  if (parser->flag.is_parsing_static_sql == 1 || parser->flag.is_parsing_trigger == 1)


Suggested change

if (parser->flag.is_parsing_static_sql == 1 || parser->flag.is_parsing_trigger == 1)

if (parser->flag.is_parsing_static_sql || parser->flag.is_parsing_trigger)

코드 리뷰 감사합니다.
말씀하신 부분을 반영하여 수정했습니다.

kangmin5505 · 2024-12-27T03:50:03Z

src/parser/compile.c

+      p = strstr (result, remove_eval_prefix);
+      if (p != NULL)
+	{
+	  p = (char *) memmove (p, p + strlen (remove_eval_prefix), strlen (p) - strlen (remove_eval_prefix) + 1);
+	}


p == NULL 일 때의 처리가 필요해 보입니다.

코드 리뷰 감사합니다.
PR #5731에서 remove_appended_trigger_evaluate() 함수를 추가하고, 해당 함수 내부에 반영하여 수정했습니다.

kangmin5505 · 2024-12-27T04:05:31Z

src/parser/compile.c

+  if (with_evaluate)
+    {
+      char *p = NULL;
+      const char *remove_eval_prefix = "evaluate (";


"evaluate (", "EVALUATE (", " ) "는
https://github.com/CUBRID/cubrid/pull/5731/files#r1896263225 에서 말씀드린 것과 마찬가지로, 한 곳에서 관리하는 것이 좋을 거 같습니다.

코드 리뷰 감사합니다.
기존 EVALUATE 문자를 소문자로 작성한 이유는, 해당 문자열이 rewritten으로 작성되며 소문자로 변경되었고, evaluate를 제거할 때만 사용되기 때문입니다.
따라서, 해당 문자열은 PR #5731에서 작성한 remove_appended_trigger_evaluate() 함수 내부에서만 사용되도록 수정했습니다.

jongmin-won · 2024-12-31T04:18:28Z

Trigger Unload 시 [user_schema] 제거 (#5731) PR에서 중복된 코드가 있어, PR(#5731) 을 먼저 머지 이후 코드 리뷰 내용을 반영하여 수정하겠습니다.

jongmin-won · 2024-12-31T04:35:57Z

github-checks / memory-monitor-check (pull_request) 에서 src/parser/compile.c: FAIL 된 이유

.github/workflows/check.yml 파일의 memory-monitor-check 부분에서 compile.c 파일이 grep 되어 FAIL 된 것으로 확인 됩니다.

filename=$(basename $f)
check_server_file=$(grep -F $filename cubrid/CMakeLists.txt)
if [ "$check_server_file" == "" ]; then
  result_for_f="PASS"
fi

예제

아래 예시와 같이 compile.c 패턴이 grep에 출력 됨을 확인 했습니다.

$ filename=$(basename compile.c)
$ echo $filename
compile.c
$ grep $filename cubrid/CMakeLists.txt
  ${SP_DIR}/pl_struct_**compile.c**pp
  ${XASL_DIR}/**compile_c**ontext.h
$ grep -F $filename cubrid/CMakeLists.txt 
  ${SP_DIR}/pl_struct_**compile.c**pp

해결방안

개발 2팀 희수님이 담당으로 알고있어 관련 내용을 전달했습니다.

jongmin-won · 2025-01-03T08:37:33Z

다음 PR (CUBRID/cubrid-testcases#2019) 에서 test_sql 과 test_plcsql 의 TC 답안지를 수정 합니다.

jongmin-won added 3 commits December 19, 2024 21:08

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

4a81ce2

Remove [user_schema] from the condition column when the owner perform…

55a8430

…s the unload utility.

jongmin-won self-assigned this Dec 20, 2024

Remove warning messages in the parse_tree_cl file.

195ad20

jongmin-won force-pushed the CBRD-25719 branch from a1c8fcc to 195ad20 Compare December 20, 2024 03:30

jongmin-won added 5 commits December 20, 2024 13:22

Fixed an issue where the action query entered by the user was rewritt…

5adef67

…en into an unexecutable rewrite query.

Second. fixed an issue where the action query entered by the user was…

fc4c1d8

… rewritten into an unexecutable rewrite query.

Third. fixed an issue where the action query entered by the user was …

5c34b6a

…rewritten into an unexecutable rewrite query.

Fourth. fixed an issue where the action query entered by the user was…

3cc99b9

… rewritten into an unexecutable rewrite query.

Fifth. fixed an issue where the action query entered by the user was …

2d1f5b8

…rewritten into an unexecutable rewrite query.

jongmin-won added 3 commits December 21, 2024 02:49

Sixth. fixed an issue where the action query entered by the user was …

1034d83

…rewritten into an unexecutable rewrite query.

Seventh. fixed an issue where the action query entered by the user wa…

897bb06

…s rewritten into an unexecutable rewrite query.

The unload utility part will be fixed in issue CBRD-25762.

93e18aa

jongmin-won requested review from hgryoo, vimkim, hyunikn, kangmin5505 and ctshim December 23, 2024 04:08

jongmin-won marked this pull request as ready for review December 23, 2024 04:11

jongmin-won requested a review from beyondykk9 as a code owner December 23, 2024 04:11

jongmin-won added 3 commits December 24, 2024 00:57

Fixed the memory-monitor-check failure issue. We suspected that a mem…

c0a67ae

…ory management issue in the change_trigger_action_query function might be the cause and have made adjustments to address it.

edited for readability.

c747dfd

remove the part that does free_and_init when new_trigger_stmt_str is …

1f14a07

…null.

ctshim reviewed Dec 24, 2024

View reviewed changes

src/parser/compile.c Show resolved Hide resolved

ctshim reviewed Dec 24, 2024

View reviewed changes

src/parser/compile.c Show resolved Hide resolved

ctshim reviewed Dec 24, 2024

View reviewed changes

beyondykk9 reviewed Dec 24, 2024

View reviewed changes

kangmin5505 reviewed Dec 27, 2024

View reviewed changes

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

39e71d3

jongmin-won added this to the fig-cake milestone Dec 30, 2024

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

19e79ea

jongmin-won added 3 commits January 2, 2025 14:06

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

3aad5e0

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

3447fc0

Reflects the code review content.

b24bf76

kangmin5505 approved these changes Jan 3, 2025

View reviewed changes

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

9629c73

jongmin-won mentioned this pull request Jan 3, 2025

[CBRD-25719] Modify the TC answer sheet due to the fix for [user_schema] storage errors in the db_trigger catalog during trigger creation and loaddb execution. CUBRID/cubrid-testcases#2019

Open

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

61101f5

ctshim approved these changes Jan 6, 2025

View reviewed changes

jongmin-won added 4 commits January 6, 2025 14:36

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

a7aaf67

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

815ef05

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

9664301

Merge remote-tracking branch 'upstream/develop' into CBRD-25719

75547f6

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CBRD-25719] Fix an issue where [user_schema] was incorrectly stored or missing in the condition and action_definition columns of the db_trigger catalog during trigger creation or loaddb execution with legacy unload files #5729

[CBRD-25719] Fix an issue where [user_schema] was incorrectly stored or missing in the condition and action_definition columns of the db_trigger catalog during trigger creation or loaddb execution with legacy unload files #5729

jongmin-won commented Dec 19, 2024 •

edited

Loading

ctshim Dec 24, 2024

jongmin-won Jan 3, 2025

ctshim Dec 24, 2024

jongmin-won Jan 3, 2025

beyondykk9 Dec 24, 2024

jongmin-won Jan 3, 2025

beyondykk9 Dec 24, 2024

jongmin-won Jan 3, 2025

kangmin5505 Dec 27, 2024

jongmin-won Jan 3, 2025

kangmin5505 Dec 27, 2024 •

edited

Loading

jongmin-won Jan 3, 2025

jongmin-won commented Dec 31, 2024

jongmin-won commented Dec 31, 2024 •

edited

Loading

jongmin-won commented Jan 3, 2025

	if (parser->flag.is_parsing_trigger == 1 && p->info.expr.flag != 0)
	if (parser->flag.is_parsing_trigger && p->info.expr.flag)

	if (parser->flag.is_parsing_static_sql == 1 \|\| parser->flag.is_parsing_trigger == 1)
	if (parser->flag.is_parsing_static_sql \|\| parser->flag.is_parsing_trigger)

[CBRD-25719] Fix an issue where [user_schema] was incorrectly stored or missing in the condition and action_definition columns of the db_trigger catalog during trigger creation or loaddb execution with legacy unload files #5729

Are you sure you want to change the base?

[CBRD-25719] Fix an issue where [user_schema] was incorrectly stored or missing in the condition and action_definition columns of the db_trigger catalog during trigger creation or loaddb execution with legacy unload files #5729

Conversation

jongmin-won commented Dec 19, 2024 • edited Loading

Purpose

Implementation

Remarks

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kangmin5505 Dec 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jongmin-won commented Dec 31, 2024

jongmin-won commented Dec 31, 2024 • edited Loading

github-checks / memory-monitor-check (pull_request) 에서 src/parser/compile.c: FAIL 된 이유

예제

해결방안

jongmin-won commented Jan 3, 2025

jongmin-won commented Dec 19, 2024 •

edited

Loading

kangmin5505 Dec 27, 2024 •

edited

Loading

jongmin-won commented Dec 31, 2024 •

edited

Loading