Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Library import 6 #888

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Library import 6 #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions build/mapping.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,16 @@
"4312064267": "https://devtools-registry.s3.yandex.net/4312064267",
"4312063561": "https://devtools-registry.s3.yandex.net/4312063561",
"2062930743": "https://devtools-registry.s3.yandex.net/2062930743",
"4111727026": "https://devtools-registry.s3.yandex.net/4111727026",
"4111727778": "https://devtools-registry.s3.yandex.net/4111727778",
"5599878022": "https://devtools-registry.s3.yandex.net/5599878022",
"5599877541": "https://devtools-registry.s3.yandex.net/5599877541",
"5599878769": "https://devtools-registry.s3.yandex.net/5599878769",
"5599877008": "https://devtools-registry.s3.yandex.net/5599877008",
"5599878473": "https://devtools-registry.s3.yandex.net/5599878473",
"2842390994": "https://devtools-registry.s3.yandex.net/2842390994",
"5310288728": "https://devtools-registry.s3.yandex.net/5310288728",
"5620327787": "https://devtools-registry.s3.yandex.net/5620327787",
"2989597929": "https://devtools-registry.s3.yandex.net/2989597929",
"2989596911": "https://devtools-registry.s3.yandex.net/2989596911",
"2989598506": "https://devtools-registry.s3.yandex.net/2989598506",
Expand Down Expand Up @@ -205,8 +213,16 @@
"4312064267": "black_linter for linux",
"4312063561": "black_linter for linux-aarch64",
"2062930743": "contrib/libs/clang11/pkg-windows-x86_64.json",
"4111727026": "contrib/libs/clang14/tools/clang-format/clang-format for darwin",
"4111727778": "contrib/libs/clang14/tools/clang-format/clang-format for linux",
"5599878022": "contrib/python/black/bin/black for darwin",
"5599877541": "contrib/python/black/bin/black for darwin-arm64",
"5599878769": "contrib/python/black/bin/black for linux",
"5599877008": "contrib/python/black/bin/black for linux-aarch64",
"5599878473": "contrib/python/black/bin/black for win32",
"2842390994": "devtools jacoco agent 0.8.7 with shaded asm",
"5310288728": "devtools jstyle runner 10.12.4",
"5620327787": "devtools jstyle runner 10.12.4",
"2989597929": "devtools/huge_python/python for darwin",
"2989596911": "devtools/huge_python/python for darwin-arm64",
"2989598506": "devtools/huge_python/python for linux",
Expand Down
2 changes: 1 addition & 1 deletion build/platform/java/jstyle_lib/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ OWNER(heretic)
IF (USE_SYSTEM_JSTYLE_LIB)
MESSAGE(WARNING System java codestyle library $USE_SYSTEM_JSTYLE_LIB will be used)
ELSE()
DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:5310288728)
DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:5620327787)
ENDIF()

END()
135 changes: 135 additions & 0 deletions build/ya.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,49 @@
}
}
},
"black": {
"executable": {
"black": [
"black"
]
},
"formula": {
"by_platform": {
"darwin-arm64": {
"uri": "sbr:5599877541"
},
"darwin-x86_64": {
"uri": "sbr:5599878022"
},
"linux-aarch64": {
"uri": "sbr:5599877008"
},
"linux-x86_64": {
"uri": "sbr:5599878769"
},
"win32-x86_64": {
"uri": "sbr:5599878473"
}
}
}
},
"clang-format": {
"executable": {
"clang-format": [
"clang-format"
]
},
"formula": {
"by_platform": {
"darwin-x86_64": {
"uri": "sbr:4111727026"
},
"linux-x86_64": {
"uri": "sbr:4111727778"
}
}
}
},
"clang16": {
"executable": {
"c++": [
Expand Down Expand Up @@ -184,6 +227,92 @@
}
}
},
"black": {
"platforms": [
{
"default": true,
"host": {
"arch": "x86_64",
"os": "LINUX"
}
},
{
"default": true,
"host": {
"arch": "aarch64",
"os": "LINUX"
}
},
{
"default": true,
"host": {
"os": "WIN"
}
},
{
"default": true,
"host": {
"os": "DARWIN"
}
},
{
"default": true,
"host": {
"arch": "arm64",
"os": "DARWIN"
}
}
],
"tools": {
"black": {
"bottle": "black",
"executable": "black"
}
}
},
"clang-format": {
"platforms": [
{
"default": true,
"host": {
"arch": "x86_64",
"os": "LINUX"
}
},
{
"default": true,
"host": {
"arch": "aarch64",
"os": "LINUX"
}
},
{
"default": true,
"host": {
"os": "WIN"
}
},
{
"default": true,
"host": {
"os": "DARWIN"
}
},
{
"default": true,
"host": {
"arch": "arm64",
"os": "DARWIN"
}
}
],
"tools": {
"clang-format": {
"bottle": "clang-format",
"executable": "clang-format"
}
}
},
"clang16": {
"env": {
"CPATH": [
Expand Down Expand Up @@ -1186,6 +1315,9 @@
"atop": {
"description": "Advanced System & Process Monitor"
},
"black": {
"description": "Python styler, Python 3 only"
},
"c++": {
"description": "Run C++ compiler"
},
Expand All @@ -1195,6 +1327,9 @@
"cc": {
"description": "Run C compiler"
},
"clang-format": {
"description": "Run Clang-Format source code formatter"
},
"clang-rename": {
"description": "Run Clang-Rename refactoring tool"
},
Expand Down
22 changes: 12 additions & 10 deletions contrib/libs/apache/arrow/cpp/src/arrow/array/diff.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,42 +629,44 @@ class MakeFormatterImpl {
auto fmt = fmt_str.c_str();
auto unit = checked_cast<const T&>(*array.type()).unit();
auto value = checked_cast<const NumericArray<T>&>(array).Value(index);
using arrow_vendored::date::format;
// Using unqualified `format` directly would produce ambiguous
// lookup because of `std::format` (ARROW-15520).
namespace avd = arrow_vendored::date;
using std::chrono::nanoseconds;
using std::chrono::microseconds;
using std::chrono::milliseconds;
using std::chrono::seconds;
if (AddEpoch) {
static arrow_vendored::date::sys_days epoch{arrow_vendored::date::jan / 1 / 1970};
static avd::sys_days epoch{avd::jan / 1 / 1970};

switch (unit) {
case TimeUnit::NANO:
*os << format(fmt, static_cast<nanoseconds>(value) + epoch);
*os << avd::format(fmt, static_cast<nanoseconds>(value) + epoch);
break;
case TimeUnit::MICRO:
*os << format(fmt, static_cast<microseconds>(value) + epoch);
*os << avd::format(fmt, static_cast<microseconds>(value) + epoch);
break;
case TimeUnit::MILLI:
*os << format(fmt, static_cast<milliseconds>(value) + epoch);
*os << avd::format(fmt, static_cast<milliseconds>(value) + epoch);
break;
case TimeUnit::SECOND:
*os << format(fmt, static_cast<seconds>(value) + epoch);
*os << avd::format(fmt, static_cast<seconds>(value) + epoch);
break;
}
return;
}
switch (unit) {
case TimeUnit::NANO:
*os << format(fmt, static_cast<nanoseconds>(value));
*os << avd::format(fmt, static_cast<nanoseconds>(value));
break;
case TimeUnit::MICRO:
*os << format(fmt, static_cast<microseconds>(value));
*os << avd::format(fmt, static_cast<microseconds>(value));
break;
case TimeUnit::MILLI:
*os << format(fmt, static_cast<milliseconds>(value));
*os << avd::format(fmt, static_cast<milliseconds>(value));
break;
case TimeUnit::SECOND:
*os << format(fmt, static_cast<seconds>(value));
*os << avd::format(fmt, static_cast<seconds>(value));
break;
}
};
Expand Down
Loading
Loading