Skip to content

Commit c015f88

Browse files
nshestakovnshestakov
committed
Merge branch 'main' into AP-commit-more-tests
2 parents 29d43e3 + c1edbff commit c015f88

File tree

223 files changed

+3511
-825
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+3511
-825
lines changed

‎.github/actions/update_changelog/update_changelog.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def to_file(changelog_path, changelog):
5757
for category, items in changelog[UNRELEASED].items():
5858
if(len(changelog[UNRELEASED][category]) == 0):
5959
continue
60-
file.write(f"{CATEGORY_PREFIX}{category}\n")
60+
file.write(f"{CATEGORY_PREFIX}{category}\n\n")
6161
for id, body in items.items():
6262
file.write(f"{ITEM_PREFIX}{id}:{body.strip()}\n")
6363
file.write("\n")
@@ -69,7 +69,7 @@ def to_file(changelog_path, changelog):
6969
for category, items in categories.items():
7070
if(len(changelog[version][category]) == 0):
7171
continue
72-
file.write(f"{CATEGORY_PREFIX}{category}\n")
72+
file.write(f"{CATEGORY_PREFIX}{category}\n\n")
7373
for id, body in items.items():
7474
file.write(f"{ITEM_PREFIX}{id}:{body.strip()}\n")
7575
file.write("\n")
@@ -83,7 +83,7 @@ def extract_changelog_category(description):
8383
return None
8484

8585
def extract_pr_number(changelog_entry):
86-
match = re.search(r"#(\d+)", changelog_entry)
86+
match = re.search(r"\* (\d+)", changelog_entry)
8787
if match:
8888
return int(match.group(1))
8989
return None

‎.github/config/muted_ya.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,6 @@ ydb/core/kqp/ut/scheme KqpScheme.AlterAsyncReplication
4242
ydb/core/kqp/ut/scheme [*/*] chunk chunk
4343
ydb/core/kqp/ut/service [*/*] chunk chunk
4444
ydb/core/kqp/ut/tx KqpSinkTx.OlapInvalidateOnError
45-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TConflictReadWriteOlap
46-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TConflictReadWriteOltp
47-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TConflictReadWriteOltpNoSink
48-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TConflictWriteOlap
49-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TConflictWriteOltp
50-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TConflictWriteOltpNoSink
51-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TReadOnlyOltp
52-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TReadOnlyOltpNoSink
53-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TSimpleOltp
54-
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TSimpleOltpNoSink
5545
ydb/core/kqp/ut/yql KqpScripting.StreamExecuteYqlScriptScanOperationTmeoutBruteForce
5646
ydb/core/mind/hive/ut TStorageBalanceTest.TestScenario2
5747
ydb/core/persqueue/ut/ut_with_sdk TopicAutoscaling.PartitionSplit_DistributedTxCommit_CheckOffsetCommitForDifferentCases_SplitedTopic

‎.github/workflows/update_changelog.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ jobs:
4343
4444
if [ "$TYPE" == "date" ]; then
4545
echo "Getting PRs since date: $START"
46-
PRS=$(gh pr list --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$BRANCH\" and .mergedAt >= \"$START\") | {id: .number}" | jq -c -s ".")
46+
PRS=$(gh pr list -L 1000 --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$BRANCH\" and .mergedAt >= \"$START\") | {id: .number}" | jq -c -s ".")
4747
elif [ "$TYPE" == "tag" ]; then
4848
echo "Fetching tags from remote"
4949
git fetch --tags
5050
echo "Getting PRs since tag: $START"
5151
COMMIT=$(git rev-list -n 1 $START)
52-
PRS=$(gh pr list --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$BRANCH\" and .mergeCommit.oid >= \"$COMMIT\") | {id: .number}" | jq -c -s ".")
52+
PRS=$(gh pr list -L 1000 --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$BRANCH\" and .mergeCommit.oid >= \"$COMMIT\") | {id: .number}" | jq -c -s ".")
5353
elif [ "$TYPE" == "commit" ]; then
5454
echo "Getting PRs since commit: $START"
55-
PRS=$(gh pr list --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$BRANCH\" and .mergeCommit.oid >= \"$START\") | {id: .number}" | jq -c -s ".")
55+
PRS=$(gh pr list -L 1000 --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$BRANCH\" and .mergeCommit.oid >= \"$START\") | {id: .number}" | jq -c -s ".")
5656
else
5757
echo "::error::Invalid type: $TYPE"
5858
exit 1

‎.github/workflows/weekly_update_changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
REF_NAME=${{ matrix.branch }}
5959
echo "::notice:: branch = $REF_NAME, date = $LAST_WEEK_DATE"
60-
PRS=$(gh pr list --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$REF_NAME\" and .mergedAt >= \"$LAST_WEEK_DATE\") | {id: .number}" | jq -c -s ".")
60+
PRS=$(gh pr list -L 1000 --state merged --json number,title,baseRefName,mergedAt --jq ".[] | select(.baseRefName == \"$REF_NAME\" and .mergedAt >= \"$LAST_WEEK_DATE\") | {id: .number}" | jq -c -s ".")
6161
6262
if [ -z "$PRS" ]; then
6363
PRS="[]"

‎build/conf/ts/node_modules.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ _PREPARE_DEPS_CMD=$TOUCH_UNIT \
4343

4444
# In case of no deps we need to create empty outputs for graph connectivity
4545
_PREPARE_NO_DEPS_CMD=$TOUCH_UNIT \
46-
&& $YMAKE_PYTHON ${input:"build/scripts/touch.py"} \
46+
&& $YMAKE_PYTHON3 ${input:"build/scripts/touch.py"} \
4747
$_PREPARE_DEPS_INOUTS \
4848
${hide;kv:"pc magenta"} ${hide;kv:"p TS_NODEP"}
4949

‎build/conf/ts/ts.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ _TS_PROJECT_SETUP_CMD=$EXTRACT_GENTAR
1717

1818
TS_CONFIG_PATH=tsconfig.json
1919

20-
EXTRACT_GENTAR=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --unpack --ext .gentar ${ext=.gentar:AUTO_INPUT}
20+
EXTRACT_GENTAR=${cwd:BINDIR} $YMAKE_PYTHON3 ${input:"build/scripts/autotar_gendirs.py"} --unpack --ext .gentar ${ext=.gentar:AUTO_INPUT}
2121

2222
### @usage: TS_CONFIG(ConfigPath)
2323
###

‎build/export_generators/ide-gradle/build.gradle.kts.any.jinja

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
{#- That is why all common macroses here -#}
44

55
{%- macro PatchRoots(arg, depend = false, output = false) -%}
6-
{#- Always replace (arcadia_root) === (SOURCE_ROOT in ymake) to $project_root in Gradle -#}
6+
{#- Always replace (arcadia_root) === (SOURCE_ROOT in ymake) to $arcadia_root in Gradle -#}
77
{%- if depend -%}
8-
{#- Replace (export_root) === (BUILD_ROOT in ymake) to $project_root in Gradle, because prebuilt tools in arcadia, not in build_root -#}
9-
"{{ arg|replace(export_root, "$project_root")|replace(arcadia_root, "$project_root") }}"
8+
{#- Replace (export_root) === (BUILD_ROOT in ymake) to $arcadia_root in Gradle, because prebuilt tools in arcadia, not in build_root -#}
9+
"{{ arg|replace(export_root, "$arcadia_root")|replace(arcadia_root, "$arcadia_root") }}"
1010
{%- elif output and arg[0] != '/' -%}
1111
{#- Relative outputs in buildDir -#}
1212
"$buildDir/{{ arg }}"
1313
{%- else -%}
1414
{#- Replace (export_root) === (BUILD_ROOT in ymake) to baseBuildDir in Gradle - root of all build folders for modules -#}
15-
"{{ arg|replace(export_root, "$baseBuildDir")|replace(arcadia_root, "$project_root") }}"
15+
"{{ arg|replace(export_root, "$baseBuildDir")|replace(arcadia_root, "$arcadia_root") }}"
1616
{%- endif -%}
1717
{%- endmacro -%}
1818

@@ -26,13 +26,14 @@
2626
{%- endmacro -%}
2727
{%- endif -%}
2828

29+
{%- include "[generator]/common_dir.jinja" -%}
30+
2931
{%- if proto_template -%}
3032
{%- include "[generator]/proto_vars.jinja" -%}
3133
{%- include "[generator]/proto_import.jinja" -%}
3234
{%- include "[generator]/proto_builddir.jinja" -%}
3335
{%- include "[generator]/proto_plugins.jinja" -%}
3436
{%- include "[generator]/proto_configuration.jinja" -%}
35-
{%- include "[generator]/proto_source_sets.jinja" -%}
3637
{%- include "[generator]/protobuf.jinja" -%}
3738
{%- include "[generator]/proto_prepare.jinja" -%}
3839
{%- include "[generator]/build.gradle.kts.common.jinja" -%}
@@ -45,7 +46,6 @@
4546
{%- include "[generator]/kotlin_plugins.jinja" -%}
4647
{%- include "[generator]/preview.jinja" -%}
4748
{%- include "[generator]/configuration.jinja" -%}
48-
{%- include "[generator]/source_sets.jinja" -%}
4949
{%- include "[generator]/test.jinja" -%}
5050
{%- include "[generator]/build.gradle.kts.common.jinja" -%}
5151
{%- include "[generator]/dependencies.jinja" -%}

‎build/export_generators/ide-gradle/build.gradle.kts.common.jinja

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
{%- include "[generator]/javac_flags.jinja" -%}
66
{%- include "[generator]/kotlinc_flags.jinja" -%}
77

8+
{%- include "[generator]/source_sets.jinja" -%}
89
{%- include "[generator]/codegen.jinja" -%}
910

10-
{%- include "[generator]/javadoc.jinja" -%}
11+
{#- To disable redundant javadoc (it may fail the build) #}
12+
13+
tasks.withType<Javadoc>().configureEach {
14+
isEnabled = false
15+
}

‎build/export_generators/ide-gradle/builddir.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{#- empty string #}
22
val baseBuildDir = "{{ export_root }}/gradle.build"
3-
buildDir = file(baseBuildDir + "/" + project.path.replace(":", "/"))
3+
buildDir = file(baseBuildDir + "{%- if common_dir %}/{{ common_dir }}{% endif -%}/" + project.path.replace(":", "/"))
44
subprojects {
5-
buildDir = file(baseBuildDir + "/" + project.path.replace(":", "/"))
5+
buildDir = file(baseBuildDir + "{%- if common_dir %}/{{ common_dir }}{% endif -%}/" + project.path.replace(":", "/"))
66
}

‎build/export_generators/ide-gradle/codegen.jinja

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,28 @@
22
{%- if proto_template %}
33

44
tasks.getByName("prepareMainProtos").dependsOn({{ taskvar }})
5-
{%- endif %}
5+
{%- endif -%}
66

7+
{#- Check main target codegen -#}
8+
{%- if varprefix == "codegen" %}
79
tasks.compileJava.configure {
810
dependsOn({{ taskvar }})
911
}
12+
{%- endif %}
1013
tasks.compileTestJava.configure {
1114
dependsOn({{ taskvar }})
1215
}
13-
{%- if with_kotlin %}
16+
{%- if with_kotlin -%}
17+
{#- Check main target codegen -#}
18+
{%- if varprefix == "codegen" %}
1419
tasks.compileKotlin.configure {
1520
dependsOn({{ taskvar }})
1621
}
22+
{%- endif %}
1723
tasks.compileTestKotlin.configure {
1824
dependsOn({{ taskvar }})
1925
}
20-
{% endif -%}
26+
{% endif -%}
2127
{%- endmacro -%}
2228

2329
{%- macro ObjDepends(obj) -%}
@@ -33,11 +39,13 @@ tasks.getByName("{{ parent_taskvar }}").dependsOn({{ taskvar }})
3339

3440
{%- if target is defined -%}
3541
{%- set current_target = target -%}
42+
{#- Main target codegen -#}
3643
{%- set varprefix = "codegen" -%}
3744
{%- include "[generator]/codegen_current_target.jinja" -%}
3845
{%- endif -%}
3946
{%- if extra_targets|length -%}
4047
{%- for current_target in extra_targets -%}
48+
{#- TestN target codegen -#}
4149
{%- set varprefix = "test" + loop.index0|tojson + "Codegen" -%}
4250
{%- include "[generator]/codegen_current_target.jinja" -%}
4351
{%- endfor -%}

0 commit comments

Comments
 (0)