diff --git a/src/backend/distributed/commands/transmit.c b/src/backend/distributed/commands/transmit.c index 04704ea47..a1c3f3e17 100644 --- a/src/backend/distributed/commands/transmit.c +++ b/src/backend/distributed/commands/transmit.c @@ -48,7 +48,7 @@ RedirectCopyDataToRegularFile(const char *filename) const int fileMode = (S_IRUSR | S_IWUSR); off_t offset = 0; - fileDesc = FileOpenForTransmit(filename, fileFlags, fileMode); + fileDesc = open(filename, fileFlags, fileMode); SendCopyInStart(); @@ -58,8 +58,7 @@ RedirectCopyDataToRegularFile(const char *filename) /* if received data has contents, append to regular file */ if (copyData->len > 0) { - int appended = FileWriteCompat(fileDesc, copyData->data, copyData->len, - offset, PG_WAIT_IO); + int appended = write(fileDesc, copyData->data, copyData->len); if (appended != copyData->len) { @@ -75,7 +74,7 @@ RedirectCopyDataToRegularFile(const char *filename) } FreeStringInfo(copyData); - FileClose(fileDesc); + close(fileDesc); } @@ -96,7 +95,7 @@ SendRegularFile(const char *filename) off_t offset = 0; /* we currently do not check if the caller has permissions for this file */ - fileDesc = FileOpenForTransmit(filename, fileFlags, fileMode); + fileDesc = open(filename, fileFlags, fileMode); /* * We read file's contents into buffers of 32 KB. This buffer size is twice @@ -107,8 +106,7 @@ SendRegularFile(const char *filename) SendCopyOutStart(); - readBytes = FileReadCompat(fileDesc, fileBuffer->data, fileBufferSize, offset, - PG_WAIT_IO); + readBytes = read(fileDesc, fileBuffer->data, fileBufferSize); while (readBytes > 0) { fileBuffer->len = readBytes; @@ -116,15 +114,14 @@ SendRegularFile(const char *filename) SendCopyData(fileBuffer); resetStringInfo(fileBuffer); - readBytes = FileReadCompat(fileDesc, fileBuffer->data, fileBufferSize, - offset, PG_WAIT_IO); + readBytes = read(fileDesc, fileBuffer->data, fileBufferSize); offset += readBytes; } SendCopyDone(); FreeStringInfo(fileBuffer); - FileClose(fileDesc); + close(fileDesc); } diff --git a/src/backend/distributed/executor/intermediate_results.c b/src/backend/distributed/executor/intermediate_results.c index d1ed74d28..ee225fea2 100644 --- a/src/backend/distributed/executor/intermediate_results.c +++ b/src/backend/distributed/executor/intermediate_results.c @@ -265,7 +265,7 @@ RemoteFileDestReceiverStartup(DestReceiver *dest, int operation, elog(DEBUG1, "writing to local file \"%s\"", fileName); - resultDest->fileDesc = FileOpenForTransmit(fileName, fileFlags, fileMode); + resultDest->fileDesc = open(fileName, fileFlags, fileMode); resultDest->offset = 0; } @@ -416,9 +416,7 @@ RemoteFileDestReceiverReceive(TupleTableSlot *slot, DestReceiver *dest) static void WriteToLocalFile(StringInfo copyData, RemoteFileDestReceiver *fileDest) { - int bytesWritten = FileWriteCompat(fileDest->fileDesc, copyData->data, copyData->len, - fileDest->offset, - PG_WAIT_IO); + int bytesWritten = write(fileDest->fileDesc, copyData->data, copyData->len); if (bytesWritten < 0) { ereport(ERROR, (errcode_for_file_access(), @@ -460,7 +458,7 @@ RemoteFileDestReceiverShutdown(DestReceiver *destReceiver) if (resultDest->writeLocalFile) { - FileClose(resultDest->fileDesc); + close(resultDest->fileDesc); } } diff --git a/src/backend/distributed/worker/worker_partition_protocol.c b/src/backend/distributed/worker/worker_partition_protocol.c index ed12fee41..61c3a7ff7 100644 --- a/src/backend/distributed/worker/worker_partition_protocol.c +++ b/src/backend/distributed/worker/worker_partition_protocol.c @@ -474,7 +474,7 @@ OpenPartitionFiles(StringInfo directoryName, uint32 fileCount) { StringInfo filePath = UserPartitionFilename(directoryName, fileIndex); - fileDescriptor = PathNameOpenFilePerm(filePath->data, fileFlags, fileMode); + fileDescriptor = open(filePath->data, fileFlags, fileMode); if (fileDescriptor < 0) { ereport(ERROR, (errcode_for_file_access(), @@ -505,7 +505,7 @@ ClosePartitionFiles(FileOutputStream *partitionFileArray, uint32 fileCount) FileOutputStreamFlush(partitionFile); - FileClose(partitionFile->fileDescriptor); + close(partitionFile->fileDescriptor); FreeStringInfo(partitionFile->fileBuffer); FreeStringInfo(partitionFile->filePath); } @@ -854,8 +854,7 @@ FileOutputStreamFlush(FileOutputStream *file) int written = 0; errno = 0; - written = FileWriteCompat(file->fileDescriptor, fileBuffer->data, fileBuffer->len, - file->offset, PG_WAIT_IO); + written = write(file->fileDescriptor, fileBuffer->data, fileBuffer->len); if (written != fileBuffer->len) { ereport(ERROR, (errcode_for_file_access(), diff --git a/src/backend/distributed/worker/worker_sql_task_protocol.c b/src/backend/distributed/worker/worker_sql_task_protocol.c index 89e7669af..1f16ce8eb 100644 --- a/src/backend/distributed/worker/worker_sql_task_protocol.c +++ b/src/backend/distributed/worker/worker_sql_task_protocol.c @@ -185,8 +185,7 @@ TaskFileDestReceiverStartup(DestReceiver *dest, int operation, taskFileDest->columnOutputFunctions = ColumnOutputFunctions(inputTupleDescriptor, copyOutState->binary); - taskFileDest->fileDesc = FileOpenForTransmit(taskFileDest->filePath, fileFlags, - fileMode); + taskFileDest->fileDesc = open(taskFileDest->filePath, fileFlags, fileMode); taskFileDest->offset = 0; if (copyOutState->binary) @@ -254,9 +253,8 @@ TaskFileDestReceiverReceive(TupleTableSlot *slot, DestReceiver *dest) static void WriteToLocalFile(StringInfo copyData, TaskFileDestReceiver *taskFileDest) { - int bytesWritten = FileWriteCompat(taskFileDest->fileDesc, copyData->data, - copyData->len, taskFileDest->offset, - PG_WAIT_IO); + int bytesWritten = write(taskFileDest->fileDesc, copyData->data, + copyData->len); if (bytesWritten < 0) { ereport(ERROR, (errcode_for_file_access(), @@ -286,7 +284,7 @@ TaskFileDestReceiverShutdown(DestReceiver *destReceiver) WriteToLocalFile(copyOutState->fe_msgbuf, taskFileDest); } - FileClose(taskFileDest->fileDesc); + close(taskFileDest->fileDesc); }