Merge pull request #28403 from nikitamikhaylov/fix-arcadia-12

Update ya.make

src/IO/ya.make

@@ -20,6 +20,8 @@ PEERDIR(
 
 SRCS(
     AIO.cpp
+    AsynchronousReadBufferFromFile.cpp
+    AsynchronousReadBufferFromFileDescriptor.cpp
     BrotliReadBuffer.cpp
     BrotliWriteBuffer.cpp
     Bzip2ReadBuffer.cpp
@@ -56,7 +58,10 @@ SRCS(
     ReadBufferFromMemory.cpp
     ReadBufferFromPocoSocket.cpp
     ReadHelpers.cpp
+    ReadSettings.cpp
     SeekAvoidingReadBuffer.cpp
+    SynchronousReader.cpp
+    ThreadPoolReader.cpp
     TimeoutSetter.cpp
     UseSSL.cpp
     WriteBufferFromEncryptedFile.cpp

src/Storages/ya.make

@@ -126,11 +126,8 @@ SRCS(
     StorageBuffer.cpp
     StorageDictionary.cpp
     StorageDistributed.cpp
-<<<<<<< add-executable-table-function
     StorageExecutable.cpp
-=======
     StorageExternalDistributed.cpp
->>>>>>> executable-table-function
     StorageFactory.cpp
     StorageFile.cpp
     StorageGenerateRandom.cpp

src/TableFunctions/ya.make

@@ -13,8 +13,8 @@ SRCS(
     ITableFunctionFileLike.cpp
     ITableFunctionXDBC.cpp
     TableFunctionDictionary.cpp
-    TableFunctionFactory.cpp
     TableFunctionExecutable.cpp
+    TableFunctionFactory.cpp
     TableFunctionFile.cpp
     TableFunctionGenerateRandom.cpp
     TableFunctionInput.cpp