提交 c7b6d311 编写于 作者: J jonathan pickett

finishing 2.8.15-->2.8.16 version update

上级 18534064
......@@ -7,7 +7,7 @@ $CurDir = [System.IO.Directory]::GetCurrentDirectory()
$PubDir = [System.IO.Path]::Combine($CurDir, "x64\Release\pub" )
$SourceDir = [System.IO.Path]::Combine($CurDir, "x64\Release" )
$DocumentationDir = [System.IO.Path]::Combine($CurDir, "setups\documentation" )
$Destination = [System.IO.Path]::Combine($CurDir, "..\bin\Release\redis-2.8.15.zip" )
$Destination = [System.IO.Path]::Combine($CurDir, "..\bin\Release\redis-2.8.16.zip" )
[System.IO.Directory]::CreateDirectory($PubDir) | Out-Null
......
......@@ -2,7 +2,7 @@
$CurDir = split-path -parent $MyInvocation.MyCommand.Definition
$SourceZip = [System.IO.Path]::Combine($CurDir, "..\..\bin\Release\redis-2.8.15.zip" )
$SourceZip = [System.IO.Path]::Combine($CurDir, "..\..\bin\Release\redis-2.8.16.zip" )
$Destination = [System.IO.Path]::Combine($CurDir, "signed_binaries" )
[System.IO.Directory]::CreateDirectory($Destination) | Out-Null
......
......@@ -3,7 +3,7 @@
<metadata>
<id>redis-64</id>
<title>redis-64</title>
<version>2.8.15</version>
<version>2.8.16</version>
<authors>Jonathan Pickett</authors>
<owners>Microsoft Open Technologies, Inc.</owners>
<summary>Redis is a very popular open-source, networked, in-memory, key-value data store known for high performance, flexibility, a rich set of data structures, and a simple straightforward API.</summary>
......
......@@ -3,7 +3,7 @@
<metadata>
<id>redis-64</id>
<title>redis-64</title>
<version>2.8.15</version>
<version>2.8.16</version>
<authors>Jonathan Pickett</authors>
<owners>Microsoft Open Technologies, Inc.</owners>
<summary>Redis is a very popular open-source, networked, in-memory, key-value data store known for high performance, flexibility, a rich set of data structures, and a simple straightforward API.</summary>
......
......@@ -552,4 +552,24 @@ char *ctime_r(const time_t *clock, char *buf) {
return buf;
}
int truncate(const char *path, long long length) {
LARGE_INTEGER newSize;
HANDLE toTruncate;
toTruncate = CreateFileA(path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
if (toTruncate != INVALID_HANDLE_VALUE) {
newSize.QuadPart = length;
if (FALSE == SetFilePointerEx(toTruncate, newSize, NULL, FILE_BEGIN)) {
errno = ENOENT;
return -1;
} else {
return 0;
}
} else {
errno = ENOENT;
return -1;
}
}
#endif
......@@ -328,5 +328,9 @@ typedef struct {
} siginfo_t;
#endif
int truncate(const char *path, long long length);
#define lseek lseek64
#endif /* WIN32 */
#endif /* WIN32FIXES_H */
......@@ -579,7 +579,11 @@ int loadAppendOnlyFile(char *filename) {
struct redis_stat sb;
int old_aof_state = server.aof_state;
long loops = 0;
#ifdef _WIN64
int64_t valid_up_to = 0; /* Offset of the latest well-formed command loaded. */
#else
off_t valid_up_to = 0; /* Offset of the latest well-formed command loaded. */
#endif
if (fp && redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0) {
server.aof_current_size = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册