remove unused fio_gzeof and fio_gzwrite.

Author: funny-falcon

src/utils/file.c

@@ -1621,7 +1621,6 @@ typedef struct fioGZFile
 	z_stream strm;
 	int      fd;
 	int      errnum;
-	bool     compress;
 	bool     eof;
 	Bytef    buf[ZLIB_BUFFER_SIZE];
 } fioGZFile;
@@ -1657,48 +1656,30 @@ gzFile
 fio_gzopen(fio_location location, const char* path, const char* mode, int level)
 {
 	int rc;
+
+	if (strchr(mode, 'w') != NULL) /* compress */
+	{
+		Assert(false);
+		elog(ERROR, "fio_gzopen(\"wb\") is not implemented");
+	}
+
 	if (fio_is_remote(location))
 	{
 		fioGZFile* gz = (fioGZFile*) pgut_malloc(sizeof(fioGZFile));
 		memset(&gz->strm, 0, sizeof(gz->strm));
 		gz->eof = 0;
 		gz->errnum = Z_OK;
-		/* check if file opened for writing */
-		if (strcmp(mode, PG_BINARY_W) == 0) /* compress */
+		gz->strm.next_in = gz->buf;
+		gz->strm.avail_in = ZLIB_BUFFER_SIZE;
+		rc = inflateInit2(&gz->strm, 15 + 16);
+		gz->strm.avail_in = 0;
+		if (rc == Z_OK)
 		{
-			gz->strm.next_out = gz->buf;
-			gz->strm.avail_out = ZLIB_BUFFER_SIZE;
-			rc = deflateInit2(&gz->strm,
-							  level,
-							  Z_DEFLATED,
-							  MAX_WBITS + 16, DEF_MEM_LEVEL,
-							  Z_DEFAULT_STRATEGY);
-			if (rc == Z_OK)
+			gz->fd = fio_open(location, path, O_RDONLY | PG_BINARY);
+			if (gz->fd < 0)
 			{
-				gz->compress = 1;
-				gz->fd = fio_open(location, path, O_WRONLY | O_CREAT | O_EXCL | PG_BINARY);
-				if (gz->fd < 0)
-				{
-					free(gz);
-					return NULL;
-				}
-			}
-		}
-		else
-		{
-			gz->strm.next_in = gz->buf;
-			gz->strm.avail_in = ZLIB_BUFFER_SIZE;
-			rc = inflateInit2(&gz->strm, 15 + 16);
-			gz->strm.avail_in = 0;
-			if (rc == Z_OK)
-			{
-				gz->compress = 0;
-				gz->fd = fio_open(location, path, O_RDONLY | PG_BINARY);
-				if (gz->fd < 0)
-				{
-					free(gz);
-					return NULL;
-				}
+				free(gz);
+				return NULL;
 			}
 		}
 		if (rc != Z_OK)
@@ -1711,16 +1692,7 @@ fio_gzopen(fio_location location, const char* path, const char* mode, int level)
 	else
 	{
 		gzFile file;
-		/* check if file opened for writing */
-		if (strcmp(mode, PG_BINARY_W) == 0)
-		{
-			int fd = open(path, O_WRONLY | O_CREAT | O_EXCL | PG_BINARY, FILE_PERMISSION);
-			if (fd < 0)
-				return NULL;
-			file = gzdopen(fd, mode);
-		}
-		else
-			file = gzopen(path, mode);
+		file = gzopen(path, mode);
 		if (file != NULL && level != Z_DEFAULT_COMPRESSION)
 		{
 			if (gzsetparams(file, level, Z_DEFAULT_STRATEGY) != Z_OK)
@@ -1796,77 +1768,14 @@ fio_gzread(gzFile f, void *buf, unsigned size)
 	}
 }
 
-int
-fio_gzwrite(gzFile f, void const* buf, unsigned size)
-{
-	if ((size_t)f & FIO_GZ_REMOTE_MARKER)
-	{
-		int rc;
-		fioGZFile* gz = (fioGZFile*)((size_t)f - FIO_GZ_REMOTE_MARKER);
-
-		gz->strm.next_in = (Bytef *)buf;
-		gz->strm.avail_in = size;
-
-		do
-		{
-			if (gz->strm.avail_out == ZLIB_BUFFER_SIZE) /* Compress buffer is empty */
-			{
-				gz->strm.next_out = gz->buf; /* Reset pointer to the  beginning of buffer */
-
-				if (gz->strm.avail_in != 0) /* Has something in input buffer */
-				{
-					rc = deflate(&gz->strm, Z_NO_FLUSH);
-					Assert(rc == Z_OK);
-					gz->strm.next_out = gz->buf; /* Reset pointer to the  beginning of buffer */
-				}
-				else
-				{
-					break;
-				}
-			}
-			rc = fio_write_async(gz->fd, gz->strm.next_out, ZLIB_BUFFER_SIZE - gz->strm.avail_out);
-			if (rc >= 0)
-			{
-				gz->strm.next_out += rc;
-				gz->strm.avail_out += rc;
-			}
-			else
-			{
-				return rc;
-			}
-		} while (gz->strm.avail_out != ZLIB_BUFFER_SIZE || gz->strm.avail_in != 0);
-
-		return size;
-	}
-	else
-	{
-		return gzwrite(f, buf, size);
-	}
-}
-
 int
 fio_gzclose(gzFile f)
 {
 	if ((size_t)f & FIO_GZ_REMOTE_MARKER)
 	{
 		fioGZFile* gz = (fioGZFile*)((size_t)f - FIO_GZ_REMOTE_MARKER);
 		int rc;
-		if (gz->compress)
-		{
-			gz->strm.next_out = gz->buf;
-			rc = deflate(&gz->strm, Z_FINISH);
-			Assert(rc == Z_STREAM_END && gz->strm.avail_out != ZLIB_BUFFER_SIZE);
-			deflateEnd(&gz->strm);
-			rc = fio_write(gz->fd, gz->buf, ZLIB_BUFFER_SIZE - gz->strm.avail_out);
-			if (rc != ZLIB_BUFFER_SIZE - gz->strm.avail_out)
-			{
-				return -1;
-			}
-		}
-		else
-		{
-			inflateEnd(&gz->strm);
-		}
+		inflateEnd(&gz->strm);
 		rc = fio_close(gz->fd);
 		free(gz);
 		return rc;
@@ -1877,20 +1786,6 @@ fio_gzclose(gzFile f)
 	}
 }
 
-int
-fio_gzeof(gzFile f)
-{
-	if ((size_t)f & FIO_GZ_REMOTE_MARKER)
-	{
-		fioGZFile* gz = (fioGZFile*)((size_t)f - FIO_GZ_REMOTE_MARKER);
-		return gz->eof;
-	}
-	else
-	{
-		return gzeof(f);
-	}
-}
-
 const char*
 fio_gzerror(gzFile f, int *errnum)
 {

src/utils/file.h

@@ -152,8 +152,6 @@ extern int     fio_close_stream(FILE* f);
 extern gzFile  fio_gzopen(fio_location location, const char* path, const char* mode, int level);
 extern int     fio_gzclose(gzFile file);
 extern int     fio_gzread(gzFile f, void *buf, unsigned size);
-extern int     fio_gzwrite(gzFile f, void const* buf, unsigned size);
-extern int     fio_gzeof(gzFile f);
 extern z_off_t fio_gzseek(gzFile f, z_off_t offset, int whence);
 extern const char* fio_gzerror(gzFile file, int *errnum);
 #endif