Skip to content

Commit d07a485

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #11909 from ydb-platform/mergelibs-241123-2111
Library import 241123-2111
2 parents 398fb41 + 9002c47 commit d07a485

File tree

3,804 files changed

+1256
-1898990
lines changed

Some content is hidden

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

3,804 files changed

+1256
-1898990
lines changed

‎build/conf/project_specific/yql_udf.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ module YQL_PYTHON_UDF: YQL_UDF_MODULE {
281281
PEERDIR(build/platform/python/ldflags)
282282
PEERDIR(library/python/type_info)
283283

284-
DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
284+
DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/udfs/common/python/python_udf/python_udfs_exports.exports)
285285

286286
when ($WINDOWS == "yes") {
287287
YQL_PYTHON_UDF_EXPORT=
@@ -307,7 +307,7 @@ module YQL_PYTHON_UDF_PROGRAM: _YQL_UDF_PROGRAM_BASE {
307307
PEERDIR(build/platform/python/ldflags)
308308
PEERDIR(library/python/type_info)
309309

310-
DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
310+
DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/udfs/common/python/python_udf/python_udfs_exports.exports)
311311

312312
when ($WINDOWS == "yes") {
313313
YQL_PYTHON_UDF_EXPORT=
@@ -331,7 +331,7 @@ module YQL_PYTHON3_UDF: YQL_UDF_MODULE {
331331
PEERDIR(build/platform/python/ldflags)
332332
PEERDIR(library/python/type_info)
333333

334-
DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
334+
DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/udfs/common/python/python_udf/python_udfs_exports.exports)
335335

336336
when ($WINDOWS == "yes") {
337337
YQL_PYTHON_UDF_EXPORT=

‎build/config/tests/cpp_style/config.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ IndentWidth: 4
4747
TabWidth: 4
4848
UseTab: Never
4949
BreakBeforeBraces: Attach
50+
InsertBraces: true
5051

5152
# NB: BraceWrapping has no effect unless BreakBeforeBraces is set to Custom
5253
BraceWrapping:

‎build/internal/conf/internal.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Intentionally empty
22
GO_ARCADIA_PROJECT_PREFIX=github.com/ydb-platform/ydb/
3-
YQL_BASE_DIR=ydb/library/yql
3+
YQL_BASE_DIR=yql/essentials
44
YQL_BASE_TEST_DIR=ydb/library/yql

‎build/platform/python/ldflags/ya.make

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
RESOURCES_LIBRARY()
22

3-
SUBSCRIBER(g:contrib)
4-
53
IF (USE_SYSTEM_PYTHON)
64
IF (OS_LINUX)
75
LDFLAGS("-L$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/lib/x86_64-linux-gnu -lpython${PY_VERSION}")

‎build/plugins/pybuild.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,11 @@ def py_program(unit, py3):
209209
if unit.get('PYTHON_SQLITE3') != 'no':
210210
peers.append('contrib/tools/python/src/Modules/_sqlite')
211211
unit.onpeerdir(peers)
212-
unit.onwindows_long_path_manifest()
212+
213+
# DEVTOOLSSUPPORT-53161
214+
if os.name == 'nt':
215+
unit.onwindows_long_path_manifest()
216+
213217
if unit.get('MODULE_TYPE') == 'PROGRAM': # can not check DLL
214218
unit.onadd_check_py_imports()
215219

‎build/ymake_conf.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,15 +1468,7 @@ def __init__(self, tc, build):
14681468
'-Wall',
14691469
'-Wextra',
14701470
]
1471-
self.cxx_warnings = [
1472-
# Issue a warning if certain overload is hidden due to inheritance
1473-
'-Woverloaded-virtual',
1474-
]
1475-
1476-
# Disable some warnings which will fail compilation at the time
1477-
self.c_warnings += [
1478-
'-Wno-parentheses',
1479-
]
1471+
self.cxx_warnings = []
14801472

14811473
self.c_defines = ['${hide:CPP_FAKEID}']
14821474
if self.target.is_android:
@@ -1537,13 +1529,16 @@ def __init__(self, tc, build):
15371529
self.sfdl_flags.append('-Qunused-arguments')
15381530

15391531
self.c_warnings += [
1532+
'-Wno-parentheses',
15401533
'-Wno-implicit-const-int-float-conversion',
1541-
# For nvcc to accept the above.
1534+
# For nvcc to accept the above
15421535
'-Wno-unknown-warning-option',
15431536
]
15441537

15451538
self.cxx_warnings += [
15461539
'-Wimport-preprocessor-directive-pedantic',
1540+
# Issue a warning if certain overload is hidden due to inheritance
1541+
'-Woverloaded-virtual',
15471542
'-Wno-ambiguous-reversed-operator',
15481543
'-Wno-defaulted-function-deleted',
15491544
'-Wno-deprecated-anon-enum-enum-conversion',
@@ -2083,11 +2078,13 @@ def print_compiler(self):
20832078

20842079
c_warnings += [
20852080
'-Wno-parentheses',
2081+
# For nvcc to accept the above
20862082
'-Wno-unknown-warning-option',
20872083
]
20882084

20892085
cxx_warnings += [
20902086
'-Wimport-preprocessor-directive-pedantic',
2087+
# Issue a warning if certain overload is hidden due to inheritance
20912088
'-Woverloaded-virtual',
20922089
'-Wno-ambiguous-reversed-operator',
20932090
'-Wno-defaulted-function-deleted',

0 commit comments

Comments
 (0)