Skip to content

Commit 01be2cc

Browse files
Merge branch 'main' into solomon_limitless_read_actor
2 parents 8a49049 + 1237379 commit 01be2cc

File tree

6,557 files changed

+35671
-2830539
lines changed

Some content is hidden

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

6,557 files changed

+35671
-2830539
lines changed

.github/config/muted_ya.txt

Lines changed: 17 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ ydb/core/blobstorage/ut_vdisk TBsVDiskGC.GCPutKeepBarrierSync
1010
ydb/core/blobstorage/ut_vdisk TBsVDiskManyPutGet.ManyPutRangeGetCompactionIndexOnly
1111
ydb/core/blobstorage/ut_vdisk [*/*] chunk chunk
1212
ydb/core/cms/ut_sentinel_unstable TSentinelUnstableTests.BSControllerCantChangeStatus
13-
ydb/core/cms/ut_sentinel_unstable sole chunk chunk
14-
ydb/core/cms/ut_sentinel_unstable sole+chunk+chunk
1513
ydb/core/fq/libs/row_dispatcher/ut sole chunk chunk
1614
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.ReadHuge
1715
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.ReadSmall
@@ -20,39 +18,21 @@ ydb/core/keyvalue/ut_trace TKeyValueTracingTest.WriteSmall
2018
ydb/core/kqp/ut/cost KqpCost.OlapWriteRow
2119
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestAggregation
2220
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestFilterCompare
23-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_1
24-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_1_clean
25-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_1_clean_with_restarts
26-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_3_1
27-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_3_2_1_clean
28-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit3_1
29-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.ChangeSchemaAndSplit
30-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.HugeSchemeHistory
31-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleMerge
32-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleMergesWithRestartsAfterWait
33-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleMergesWithRestartsWhenWait
34-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSchemaVersions
35-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSplits
36-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSplitsThenMerges
37-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSplitsWithRestartsAfterWait
38-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSplitsWithRestartsWhenWait
39-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.TableReshardingConsistency64
40-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.TableReshardingModuloN
41-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.UpsertWhileSplitTest
4221
ydb/core/kqp/ut/olap KqpOlapSysView.StatsSysViewBytesDictActualization
4322
ydb/core/kqp/ut/olap KqpOlapSysView.StatsSysViewBytesDictStatActualization
4423
ydb/core/kqp/ut/olap KqpOlapWrite.TierDraftsGCWithRestart
4524
ydb/core/kqp/ut/olap [*/*] chunk chunk
4625
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable+ColumnStore
4726
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable-ColumnStore
4827
ydb/core/kqp/ut/query KqpStats.SysViewClientLost
28+
ydb/core/kqp/ut/query KqpLimits.OutOfSpaceYQLUpsertFail+useSink
29+
ydb/core/kqp/ut/query KqpLimits.QSReplySizeEnsureMemoryLimits+useSink
4930
ydb/core/kqp/ut/scheme KqpOlapScheme.TenThousandColumns
5031
ydb/core/kqp/ut/scheme KqpScheme.AlterAsyncReplication
32+
ydb/core/kqp/ut/scheme KqpScheme.AlterTransfer
5133
ydb/core/kqp/ut/scheme [*/*] chunk chunk
52-
ydb/core/kqp/ut/scheme [*/*]+chunk+chunk
5334
ydb/core/kqp/ut/service KqpQueryService.ExecuteQueryWithResourcePoolClassifier
5435
ydb/core/kqp/ut/service [*/*] chunk chunk
55-
ydb/core/kqp/ut/service [*/*]+chunk+chunk
5636
ydb/core/kqp/ut/spilling KqpScanSpilling.SelfJoinQueryService
5737
ydb/core/kqp/ut/tx KqpSinkTx.OlapInvalidateOnError
5838
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TConflictReadWriteOlap
@@ -67,32 +47,35 @@ ydb/core/kqp/ut/tx KqpSnapshotIsolation.TSimpleOltp
6747
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TSimpleOltpNoSink
6848
ydb/core/kqp/ut/yql KqpScripting.StreamExecuteYqlScriptScanOperationTmeoutBruteForce
6949
ydb/core/mind/hive/ut THiveTest.TestReassignUseRelativeSpace
70-
ydb/core/persqueue/ut [*/*] chunk chunk
7150
ydb/core/quoter/ut QuoterWithKesusTest.PrefetchCoefficient
7251
ydb/core/statistics/aggregator/ut AnalyzeColumnshard.AnalyzeRebootColumnShard
52+
ydb/core/tablet_flat/ut TSharedPageCache.ClockPro
7353
ydb/core/tablet_flat/ut TSharedPageCache.Compaction_BTreeIndex
54+
ydb/core/tablet_flat/ut TSharedPageCache.Compaction_FlatIndex
55+
ydb/core/tablet_flat/ut TSharedPageCache.Compaction_ZeroCache_BTreeIndex
56+
ydb/core/tablet_flat/ut TSharedPageCache.Compaction_ZeroCache_FlatIndex
57+
ydb/core/tablet_flat/ut TSharedPageCache.Limits
58+
ydb/core/tablet_flat/ut TSharedPageCache.Limits_Config
59+
ydb/core/tablet_flat/ut TSharedPageCache.ReplacementPolicySwitch
60+
ydb/core/tablet_flat/ut TSharedPageCache.S3FIFO
61+
ydb/core/tablet_flat/ut TSharedPageCache.ThreeLeveledLRU
7462
ydb/core/tx/datashard/ut_incremental_backup IncrementalBackup.ComplexRestoreBackupCollection+WithIncremental
7563
ydb/core/tx/schemeshard/ut_login_large TSchemeShardLoginLargeTest.RemoveLogin_Many
7664
ydb/core/tx/schemeshard/ut_move_reboots TSchemeShardMoveRebootsTest.WithData
7765
ydb/core/tx/schemeshard/ut_move_reboots TSchemeShardMoveRebootsTest.WithDataAndPersistentPartitionStats
7866
ydb/core/tx/schemeshard/ut_pq_reboots TPqGroupTestReboots.AlterWithReboots-PQConfigTransactionsAtSchemeShard-false
79-
ydb/core/tx/schemeshard/ut_pq_reboots TPqGroupTestReboots.CreateAlter-PQConfigTransactionsAtSchemeShard-true
80-
ydb/core/tx/schemeshard/ut_pq_reboots TPqGroupTestReboots.CreateAlterDropPqGroupWithReboots-PQConfigTransactionsAtSchemeShard-true
81-
ydb/core/tx/schemeshard/ut_restore TImportWithRebootsTests.ShouldSucceedOnSingleChangefeed
82-
ydb/core/tx/schemeshard/ut_restore [*/*] chunk chunk
8367
ydb/core/tx/tiering/ut ColumnShardTiers.TTLUsage
8468
ydb/core/viewer/tests test.py.test_viewer_nodes
8569
ydb/core/viewer/tests test.py.test_viewer_sysinfo
8670
ydb/core/viewer/ut Viewer.TabletMerging
87-
ydb/library/actors/http/ut sole chunk chunk
88-
ydb/library/actors/http/ut sole+chunk+chunk
8971
ydb/library/actors/interconnect/ut_huge_cluster HugeCluster.AllToAll
9072
ydb/library/actors/interconnect/ut_huge_cluster sole chunk chunk
73+
ydb/library/yaml_config/ut_transform test_transform.py.TestYamlConfigTransformations.test_basic[args1-dump_ds_init]
74+
ydb/library/yql/dq/opt/ut HypergraphBuild.JoinTopologiesBenchmark
75+
ydb/library/yql/dq/opt/ut sole chunk chunk
9176
ydb/library/yql/providers/generic/connector/tests/datasource/ydb test.py.test_select_positive[column_selection_col2_COL1-kqprun]
9277
ydb/library/yql/providers/generic/connector/tests/join test.py.test_join[join_ch_ch-kqprun]
9378
ydb/library/yql/providers/generic/connector/tests/join test.py.test_join[join_pg_pg-kqprun]
94-
ydb/services/keyvalue/ut sole chunk chunk
95-
ydb/services/keyvalue/ut sole+chunk+chunk
9679
ydb/services/persqueue_v1/ut TPersQueueCommonTest.TestLimiterLimitsWithBlobsRateLimit
9780
ydb/services/persqueue_v1/ut TPersQueueCommonTest.TestLimiterLimitsWithUserPayloadRateLimit
9881
ydb/services/ydb/sdk_sessions_pool_ut YdbSdkSessionsPool.StressTestSync1
@@ -103,10 +86,6 @@ ydb/services/ydb/sdk_sessions_ut [*/*] chunk chunk
10386
ydb/services/ydb/table_split_ut [*/*] chunk chunk
10487
ydb/services/ydb/ut YdbLogStore.AlterLogTable
10588
ydb/tests/fq/control_plane_storage [*/*] chunk chunk
106-
ydb/tests/fq/control_plane_storage [*/*]+chunk+chunk
107-
ydb/tests/fq/generic/analytics sole chunk chunk
108-
ydb/tests/fq/generic/streaming sole chunk chunk
109-
ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_simple[v1-fq_client0-mvp_external_ydb_endpoint0]
11089
ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_streamlookup[v1-0-True-3-fq_client0-mvp_external_ydb_endpoint0]
11190
ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_streamlookup[v1-1-True-3-fq_client0-mvp_external_ydb_endpoint0]
11291
ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_streamlookup[v1-2-True-3-fq_client0-mvp_external_ydb_endpoint0]
@@ -117,18 +96,11 @@ ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_streamlookup[
11796
ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_streamlookup[v1-7-True-3-fq_client0-mvp_external_ydb_endpoint0]
11897
ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_streamlookup[v1-8-True-3-fq_client0-mvp_external_ydb_endpoint0]
11998
ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_streamlookup[v1-9-True-3-fq_client0-mvp_external_ydb_endpoint0]
120-
ydb/tests/fq/mem_alloc sole chunk chunk
121-
ydb/tests/fq/mem_alloc sole+chunk+chunk
12299
ydb/tests/fq/mem_alloc test_scheduling.py.TestSchedule.test_skip_busy[kikimr0]
123-
ydb/tests/fq/multi_plane [test_dispatch.py] chunk chunk
124-
ydb/tests/fq/multi_plane [test_dispatch.py]+chunk+chunk
125100
ydb/tests/fq/multi_plane [test_retry.py] chunk chunk
126-
ydb/tests/fq/multi_plane [test_retry.py]+chunk+chunk
127101
ydb/tests/fq/multi_plane [test_retry_high_rate.py] chunk chunk
128102
ydb/tests/fq/s3 [test_format_setting.py] chunk chunk
129-
ydb/tests/fq/s3 [test_inflight.py] chunk chunk
130103
ydb/tests/fq/yds [*/*] chunk chunk
131-
ydb/tests/fq/yds [*/*]+chunk+chunk
132104
ydb/tests/fq/yds test_2_selects_limit.py.TestSelectLimit.test_select_same[v1]
133105
ydb/tests/fq/yds test_2_selects_limit.py.TestSelectLimit.test_select_sequence[v1]
134106
ydb/tests/fq/yds test_big_state.py.TestBigState.test_gt_8mb[v1]
@@ -137,7 +109,6 @@ ydb/tests/fq/yds test_mem_alloc.py.TestMemAlloc.test_join_alloc[v1]
137109
ydb/tests/fq/yds test_recovery.py.TestRecovery.test_ic_disconnection
138110
ydb/tests/fq/yds test_select_limit_db_id.py.TestSelectLimitWithDbId.test_select_same_with_id[v1-mvp_external_ydb_endpoint0]
139111
ydb/tests/fq/yds test_yds_bindings.py.TestBindings.test_yds_insert[v1]
140-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_simple
141112
ydb/tests/functional/compatibility test_followers.py.TestFollowersCompatibility.test_followers_compatability
142113
ydb/tests/functional/hive test_drain.py.TestHive.test_drain_on_stop
143114
ydb/tests/functional/rename [test_rename.py */*] chunk chunk
@@ -146,7 +117,9 @@ ydb/tests/functional/serializable sole chunk chunk
146117
ydb/tests/functional/serializable test.py.test_local
147118
ydb/tests/functional/serverless test_serverless.py.test_database_with_disk_quotas[enable_alter_database_create_hive_first--false]
148119
ydb/tests/functional/serverless test_serverless.py.test_database_with_disk_quotas[enable_alter_database_create_hive_first--true]
120+
ydb/tests/functional/suite_tests [test_sql_logic.py */*] chunk chunk
149121
ydb/tests/functional/suite_tests test_postgres.py.TestPGSQL.test_sql_suite[plan-jointest/join2.test]
122+
ydb/tests/functional/suite_tests test_sql_logic.py.TestSQLLogic.test_sql_suite[results-select3-13.test]
150123
ydb/tests/functional/tenants test_auth_system_views.py.test_tenant_auth_groups_access[clusteruser-False]
151124
ydb/tests/functional/tenants test_auth_system_views.py.test_tenant_auth_groups_access[dbadmin-True]
152125
ydb/tests/functional/tenants test_auth_system_views.py.test_tenant_auth_groups_access[ordinaryuser-False]
@@ -253,7 +226,6 @@ ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generate
253226
ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generated[TestStringWithNul]
254227
ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generated[TestTimestampWithTimeZone]
255228
ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generated[TestTxOptions]
256-
ydb/tests/sql sole chunk chunk
257229
ydb/tests/sql/large sole chunk chunk
258230
ydb/tests/sql/large test_insert_delete_duplicate_records.py.TestConcurrentInsertDeleteAndRead.test_bulkupsert_delete_and_read_tpch
259231
ydb/tests/sql/large test_insert_delete_duplicate_records.py.TestConcurrentInsertDeleteAndRead.test_insert_delete_and_read_simple_tx
@@ -265,7 +237,6 @@ ydb/tests/sql/large test_workload_manager.py.TestWorkloadManager.test_pool_class
265237
ydb/tests/sql/large test_workload_manager.py.TestWorkloadManager.test_resource_pool_queue_resource_weight[1-False]
266238
ydb/tests/sql/large test_workload_manager.py.TestWorkloadManager.test_resource_pool_queue_resource_weight[1-True]
267239
ydb/tests/sql/large test_workload_manager.py.TestWorkloadManager.test_resource_pool_queue_size_limit
268-
ydb/tests/olap/ttl_tiering ttl_delete_s3.py.TestDeleteS3Ttl.test_delete_s3_tiering
269240
ydb/tests/stress/log/tests test_workload.py.TestYdbLogWorkload.test[column]
270241
ydb/tests/stress/log/tests test_workload.py.TestYdbLogWorkload.test[row]
271242
ydb/tools/stress_tool/ut TDeviceTestTool.PDiskTestLogWrite

.github/scripts/analytics/flaky_tests_history.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ def main():
8585
history_for_n_day = args.days_window
8686
build_type = args.build_type
8787
branch = args.branch
88-
89-
print(f'Getting hostory in window {history_for_n_day} days')
90-
88+
89+
print(f'Getting history in window {history_for_n_day} days')
90+
9191

9292
if "CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS" not in os.environ:
9393
print(
@@ -109,17 +109,17 @@ def main():
109109
session = ydb.retry_operation_sync(
110110
lambda: driver.table_client.session().create()
111111
)
112-
112+
113113
# settings, paths, consts
114114
tc_settings = ydb.TableClientSettings().with_native_date_in_result_sets(enabled=True)
115115
table_client = ydb.TableClient(driver, tc_settings)
116-
116+
117117
table_path = f'test_results/analytics/flaky_tests_window_{history_for_n_day}_days'
118-
default_start_date = datetime.date(2024, 9, 1)
119-
118+
default_start_date = datetime.date(2025, 2, 28)
119+
120120
with ydb.SessionPool(driver) as pool:
121121
create_tables(pool, table_path)
122-
122+
123123
# geting last date from history
124124
last_date_query = f"""select max(date_window) as max_date_window from `{table_path}`
125125
where build_type = '{build_type}' and branch = '{branch}'"""
@@ -132,16 +132,16 @@ def main():
132132
results = results + result.result_set.rows
133133
except StopIteration:
134134
break
135-
135+
136136
if results[0] and results[0].get( 'max_date_window', default_start_date) is not None and results[0].get( 'max_date_window', default_start_date) > default_start_date:
137137
last_datetime = results[0].get(
138138
'max_date_window', default_start_date)
139139

140140
else:
141141
last_datetime = default_start_date
142-
142+
143143
last_date = last_datetime.strftime('%Y-%m-%d')
144-
144+
145145
print(f'last hisotry date: {last_date}')
146146
# getting history for dates >= last_date
147147

@@ -178,7 +178,7 @@ def main():
178178
max(run_timestamp) as last_run
179179
from (
180180
select * from (
181-
181+
182182
select distinct
183183
full_name,
184184
suite_folder,
@@ -187,30 +187,30 @@ def main():
187187
Date('{date}') as date_base,
188188
'{build_type}' as build_type,
189189
'{branch}' as branch
190-
from `test_results/analytics/testowners`
190+
from `test_results/analytics/testowners`
191+
where run_timestamp_last >= Date('{date}') - Interval('P30D')
191192
) as test_and_date
192193
left JOIN (
193-
194+
194195
select
195196
suite_folder || '/' || test_name as full_name,
196197
run_timestamp,
197198
status
198199
from `test_results/test_runs_column`
199200
where
200201
run_timestamp <= Date('{date}') + Interval("P1D")
201-
and run_timestamp >= Date('{date}') - {history_for_n_day+1}*Interval("P1D")
202-
202+
and run_timestamp >= Date('{date}') {'' if history_for_n_day==1 else f'-{history_for_n_day}*Interval("P1D")'}
203203
and job_name in (
204204
'Nightly-run',
205205
'Regression-run',
206206
'Regression-whitelist-run',
207-
'Postcommit_relwithdebinfo',
207+
'Postcommit_relwithdebinfo',
208208
'Postcommit_asan'
209-
)
209+
)
210210
and build_type = '{build_type}'
211211
and branch = '{branch}'
212212
order by full_name,run_timestamp desc
213-
213+
214214
) as hist
215215
ON test_and_date.full_name=hist.full_name
216216
)

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ __pycache__/
3333

3434
# MacOS specific
3535
.DS_Store
36+
*.dSYM
3637

3738
# clangd cache
3839
/.cache

build/conf/autoincludes.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[
22
"devtools/ya",
33
"library/cpp/geo",
4-
"util"
4+
"util",
5+
"yql/essentials"
56
]
67

build/conf/bison_lex.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Thus uses _ADD_HIDDEN_INPUTS() macro from ymake.core.conf
55

66
M4_PATH=contrib/tools/m4
7+
M4_BINARY=${tool:M4_PATH}
78

89
LEX_FLAGS=
910
BISON_FLAGS=-v

build/conf/docs.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ _DOCS_YFM_CMD=$_DOCS_YFM_CMD_IMPL($_DOCS_CONFIG_VALUE EXTRA_INPUTS $_DOCS_EXTRA_
5353
### should be defined here.
5454
module _DOCS_BARE_UNIT: _BARE_UNIT {
5555
.ALLOWED=DOCS_DIR DOCS_CONFIG DOCS_VARS
56-
.CMD=TOUCH_DOCS_MF
56+
.CMD=$TOUCH_DOCS_MF
57+
.STRUCT_CMD=yes
5758
.FINAL_TARGET=no
5859
.NODE_TYPE=Bundle
5960
.PEERDIR_POLICY=as_include
@@ -82,7 +83,7 @@ _DOCS_LIBRARY_CMD=$_DOCS_LIBRARY_CMD_IMPL(SOURCES $_DOCS_SOURCES_VALUE INCLUDE_S
8283

8384
# tag:docs
8485
module DOCS_LIBRARY: _DOCS_BARE_UNIT {
85-
.CMD=_DOCS_LIBRARY_CMD
86+
.CMD=$_DOCS_LIBRARY_CMD
8687
.ALIASES=SRCS=_DOCS_SRCS DOCS_DIR=_YFM_DOCS_DIR
8788
.EPILOGUE=_DOCS_LIBRARY_EPILOGUE
8889
.NODE_TYPE=Library
@@ -150,7 +151,7 @@ macro _DOCS_YFM_USE_PLANTUML() {
150151
### @see: [DOCS_DIR()](#macro_DOCS_DIR), [DOCS_CONFIG()](#macro_DOCS_CONFIG), [DOCS_VARS()](#macro_DOCS_VARS).
151152
multimodule DOCS {
152153
module DOCSBOOK: _DOCS_BASE_UNIT {
153-
.CMD=_DOCS_YFM_CMD
154+
.CMD=$_DOCS_YFM_CMD
154155
.FINAL_TARGET=yes
155156
.PEERDIR_POLICY=as_build_from
156157
.IGNORED=DOCS_DIR DOCS_INCLUDE_SOURCES DOCS_COPY_FILES PEERDIR PYTHON RUN_PROGRAM RUN_PYTHON3 RUN_LUA RUN_JAVA_PROGRAM FROM_SANDBOX SRCS COPY COPY_FILE FILES
@@ -167,7 +168,7 @@ multimodule DOCS {
167168
}
168169

169170
module DOCSLIB: _DOCS_BASE_UNIT {
170-
.CMD=_DOCS_YFM_CMD
171+
.CMD=$_DOCS_YFM_CMD
171172
.PEERDIR_POLICY=as_build_from
172173
.IGNORED=DOCS_DIR DOCS_INCLUDE_SOURCES DOCS_COPY_FILES PEERDIR PYTHON RUN_PROGRAM RUN_PYTHON3 RUN_LUA RUN_JAVA_PROGRAM FROM_SANDBOX SRCS COPY COPY_FILE FILES
173174
.PEERDIRSELF=DOCSLIB_INTERNAL

build/conf/go.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,5 +1022,5 @@ macro GO_MOCKGEN_MOCKS() {
10221022
PEERDIR(vendor/go.uber.org/mock/gomock)
10231023

10241024
# Unfortunately ${rootrel;tool:TOOL} doesn't work currently, so we use this ugly workaround $MODDIR/gen/gen$_GO_EXE_SUFFIX
1025-
RUN_PROGRAM(vendor/go.uber.org/mock/mockgen -package mocks -exec_only $MODDIR/gen/gen$_GO_EXE_SUFFIX ${GO_ARCADIA_PROJECT_PREFIX}${MOCKGEN_FROM} $MOCKGEN_TYPES STDOUT main.go TOOL $MODDIR/gen CWD $ARCADIA_BUILD_ROOT)
1025+
RUN_PROGRAM(vendor/go.uber.org/mock/mockgen -package mocks -exec_only $MODDIR/gen/gen$_GO_EXE_SUFFIX ${GO_ARCADIA_PROJECT_PREFIX}${MOCKGEN_FROM} $MOCKGEN_TYPES STDOUT main.go TOOL $MODDIR/gen CWD $ARCADIA_BUILD_ROOT ENV PATH=${GO_TOOLS_ROOT}/bin GOROOT=${GO_TOOLS_ROOT} GOCACHE=${BINDIR}/.gocache)
10261026
}

0 commit comments

Comments
 (0)