Browse Source

[C++] [userver] Bump userver commit and switch to clang-16 (#8306)

itrofimow 2 years ago
parent
commit
bccc5a853e

+ 4 - 3
frameworks/C++/userver/userver-bare.dockerfile

@@ -1,10 +1,11 @@
 FROM ghcr.io/userver-framework/ubuntu-userver-build-base:v1 AS builder
 FROM ghcr.io/userver-framework/ubuntu-userver-build-base:v1 AS builder
 
 
-RUN apt install -y clang-14 lld-14
+RUN apt install -y lsb-release wget software-properties-common gnupg && \
+    wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
 
 
 WORKDIR /src
 WORKDIR /src
 RUN git clone https://github.com/userver-framework/userver.git && \
 RUN git clone https://github.com/userver-framework/userver.git && \
-    cd userver && git checkout b8070f28ea2fcbb4d72ccac1449639a2f352a001
+    cd userver && git checkout ce195952bf3050a1f410c274b1c4bc13887957b0
 COPY userver_benchmark/ ./
 COPY userver_benchmark/ ./
 RUN mkdir build && cd build && \
 RUN mkdir build && cd build && \
     cmake -DUSERVER_IS_THE_ROOT_PROJECT=0 -DUSERVER_FEATURE_CRYPTOPP_BLAKE2=0 \
     cmake -DUSERVER_IS_THE_ROOT_PROJECT=0 -DUSERVER_FEATURE_CRYPTOPP_BLAKE2=0 \
@@ -12,7 +13,7 @@ RUN mkdir build && cd build && \
           -DUSERVER_FEATURE_UTEST=0 \
           -DUSERVER_FEATURE_UTEST=0 \
           -DUSERVER_FEATURE_POSTGRESQL=1 \
           -DUSERVER_FEATURE_POSTGRESQL=1 \
           -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-march=native" -DCMAKE_C_FLAGS="-march=native" \
           -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-march=native" -DCMAKE_C_FLAGS="-march=native" \
-          -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_C_COMPILER=clang-14 -DUSERVER_USE_LD=lld-14 .. && \
+          -DCMAKE_CXX_COMPILER=clang++-16 -DCMAKE_C_COMPILER=clang-16 -DUSERVER_USE_LD=lld-16 .. && \
     make -j $(nproc)
     make -j $(nproc)
 
 
 FROM builder AS runner
 FROM builder AS runner

+ 4 - 3
frameworks/C++/userver/userver.dockerfile

@@ -1,10 +1,11 @@
 FROM ghcr.io/userver-framework/ubuntu-userver-build-base:v1 AS builder
 FROM ghcr.io/userver-framework/ubuntu-userver-build-base:v1 AS builder
 
 
-RUN apt install -y clang-14 lld-14
+RUN apt install -y lsb-release wget software-properties-common gnupg && \
+    wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
 
 
 WORKDIR /src
 WORKDIR /src
 RUN git clone https://github.com/userver-framework/userver.git && \
 RUN git clone https://github.com/userver-framework/userver.git && \
-    cd userver && git checkout b8070f28ea2fcbb4d72ccac1449639a2f352a001
+    cd userver && git checkout ce195952bf3050a1f410c274b1c4bc13887957b0
 COPY userver_benchmark/ ./
 COPY userver_benchmark/ ./
 RUN mkdir build && cd build && \
 RUN mkdir build && cd build && \
     cmake -DUSERVER_IS_THE_ROOT_PROJECT=0 -DUSERVER_FEATURE_CRYPTOPP_BLAKE2=0 \
     cmake -DUSERVER_IS_THE_ROOT_PROJECT=0 -DUSERVER_FEATURE_CRYPTOPP_BLAKE2=0 \
@@ -12,7 +13,7 @@ RUN mkdir build && cd build && \
           -DUSERVER_FEATURE_UTEST=0 \
           -DUSERVER_FEATURE_UTEST=0 \
           -DUSERVER_FEATURE_POSTGRESQL=1 \
           -DUSERVER_FEATURE_POSTGRESQL=1 \
           -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-march=native" -DCMAKE_C_FLAGS="-march=native" \
           -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-march=native" -DCMAKE_C_FLAGS="-march=native" \
-          -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_C_COMPILER=clang-14 -DUSERVER_USE_LD=lld-14 .. && \
+          -DCMAKE_CXX_COMPILER=clang++-16 -DCMAKE_C_COMPILER=clang-16 -DUSERVER_USE_LD=lld-16 .. && \
     make -j $(nproc)
     make -j $(nproc)
 
 
 FROM builder AS runner
 FROM builder AS runner

+ 2 - 0
frameworks/C++/userver/userver_configs/dynamic_config_fallback.json

@@ -1,6 +1,7 @@
 {
 {
   "USERVER_CACHES": {},
   "USERVER_CACHES": {},
   "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,
   "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,
+  "POSTGRES_CONGESTION_CONTROL_SETTINGS": {},
   "POSTGRES_DEADLINE_PROPAGATION_ENABLED": false,
   "POSTGRES_DEADLINE_PROPAGATION_ENABLED": false,
   "POSTGRES_CONNECTION_PIPELINE_MODE_ENABLED": false,
   "POSTGRES_CONNECTION_PIPELINE_MODE_ENABLED": false,
   "POSTGRES_CONNECTION_PIPELINE_EXPERIMENT": 0,
   "POSTGRES_CONNECTION_PIPELINE_EXPERIMENT": 0,
@@ -44,6 +45,7 @@
 
 
   "POSTGRES_STATEMENT_METRICS_SETTINGS": {},
   "POSTGRES_STATEMENT_METRICS_SETTINGS": {},
   "POSTGRES_CONNLIMIT_MODE_AUTO_ENABLED": false,
   "POSTGRES_CONNLIMIT_MODE_AUTO_ENABLED": false,
+  "POSTGRES_DEADLINE_PROPAGATION_VERSION": 0,
   "POSTGRES_CONNECTION_PIPELINE_ENABLED": false,
   "POSTGRES_CONNECTION_PIPELINE_ENABLED": false,
   "POSTGRES_CONNECTION_POOL_SETTINGS": {},
   "POSTGRES_CONNECTION_POOL_SETTINGS": {},
   "POSTGRES_CONNECTION_SETTINGS": {},
   "POSTGRES_CONNECTION_SETTINGS": {},