Skip to content

Commit 9ddb6e8

Browse files
committed
合并上游代码,但并未对新出现的代码进行注释
1 parent 11d5ff5 commit 9ddb6e8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+9407
-2925
lines changed

00-RELEASENOTES

+11-80
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,16 @@
1-
Redis 2.6 release notes
1+
Hello! This file is just a placeholder, since this is the "unstable" branch
2+
of Redis, the place where all the development happens.
23

3-
Migrating from 2.4 to 2.6
4-
=========================
4+
There is no release notes for this branch, it gets forked into another branch
5+
every time there is a partial feature freeze in order to eventually create
6+
a new stable release.
57

6-
Redis 2.4 is mostly a strict subset of 2.6. However there are a few things
7-
that you should be aware of:
8+
Usually "unstable" is stable enough for you to use it in development enviromnets
9+
however you should never use it in production environments. It is possible
10+
to download the latest stable release here:
811

9-
* You can't use .rdb and AOF files generated with 2.6 into a 2.4 instance.
10-
* 2.6 slaves can be attached to 2.4 masters, but not the contrary, and only
11-
for the time needed to perform the version upgrade.
12+
http://download.redis.io/releases/redis-stable.tar.gz
1213

13-
There are also a few API differences, that are unlikely to cause problems,
14-
but it is better to keep them in mind:
14+
More information is available at http://redis.io
1515

16-
* SORT now will refuse to sort in numerical mode elements that can't be parsed
17-
as numbers.
18-
* EXPIREs now all have millisecond resolution (but this is very unlikely to
19-
break code that was not conceived exploting the previous resolution error
20-
in some way.)
21-
* INFO output is a bit different now, and contains empty lines and comments
22-
starting with '#'. All the major clients should be already fixed to work
23-
with the new INFO format.
24-
25-
Also the following redis.conf and CONFIG GET / SET parameters changed name:
26-
27-
* hash-max-zipmap-entries, now replaced by hash-max-ziplist-entries
28-
* hash-max-zipmap-value, now replaced by hash-max-ziplist-value
29-
* glueoutputbuf was now completely removed as it does not make sense
30-
31-
---------
32-
CHANGELOG
33-
---------
34-
35-
What's new in Redis 2.6.0
36-
=========================
37-
38-
UPGRADE URGENCY: We suggest new users to start with 2.6.0, and old users to
39-
upgrade after some testing of the application with the new
40-
Redis version.
41-
42-
* Server side Lua scripting, see http://redis.io/commands/eval
43-
* Virtual Memory removed (was deprecated in 2.4)
44-
* Hardcoded limits about max number of clients removed.
45-
* AOF low level semantics is generally more sane, and especially when used
46-
in slaves.
47-
* Milliseconds resolution expires, also added new commands with milliseconds
48-
precision (PEXPIRE, PTTL, ...).
49-
* Clients max output buffer soft and hard limits. You can specifiy different
50-
limits for different classes of clients (normal,pubsub,slave).
51-
* AOF is now able to rewrite aggregate data types using variadic commands,
52-
often producing an AOF that is faster to save, load, and is smaller in size.
53-
* Every redis.conf directive is now accepted as a command line option for the
54-
redis-server binary, with the same name and number of arguments.
55-
* Hash table seed randomization for protection against collisions attacks.
56-
* Performances improved when writing large objects to Redis.
57-
* Significant parts of the core refactored or rewritten. New internal APIs
58-
and core changes allowed to develop Redis Cluster on top of the new code,
59-
however for 2.6 all the cluster code was removed, and will be released with
60-
Redis 3.0 when it is more complete and stable.
61-
* Redis ASCII art logo added at startup.
62-
* Crash report on memory violation or failed asserts improved significantly
63-
to make debugging of hard to catch bugs simpler.
64-
* redis-benchmark improvements: ability to run selected tests,
65-
CSV output, faster, better help.
66-
* redis-cli improvements: --eval for comfortable development of Lua scripts.
67-
* SHUTDOWN now supports two optional arguments: "SAVE" and "NOSAVE".
68-
* INFO output split into sections, the command is now able to just show
69-
pecific sections.
70-
* New statistics about how many time a command was called, and how much
71-
execution time it used (INFO commandstats).
72-
* More predictable SORT behavior in edge cases.
73-
* INCRBYFLOAT and HINCRBYFLOAT commands.
74-
75-
--------------------------------------------------------------------------------
76-
77-
Credits: Where not specified the implementation and design are done by
78-
Salvatore Sanfilippo and Pieter Noordhuis. Thanks to VMware for making all
79-
this possible. Also many thanks to all the other contributors and the amazing
80-
community we have.
81-
82-
See commit messages for more credits.
83-
84-
Cheers,
85-
Salvatore
16+
Happy hacking!

COPYING

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2006-2012, Salvatore Sanfilippo
1+
Copyright (c) 2006-2014, Salvatore Sanfilippo
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)