From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Wed, 6 Apr 2011 14:15:01 +0000 (+0200)
Subject: Merge branch 'unstable' into unstable-zset
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/7d8c555e92954b02d40c15702476fd48e55c4f94?ds=sidebyside

Merge branch 'unstable' into unstable-zset

Conflicts:
	src/object.c
---

7d8c555e92954b02d40c15702476fd48e55c4f94
diff --cc src/object.c
index c384d600,6a9b0214..4bf1df01
--- a/src/object.c
+++ b/src/object.c
@@@ -93,18 -93,15 +93,22 @@@ robj *createHashObject(void) 
  
  robj *createZsetObject(void) {
      zset *zs = zmalloc(sizeof(*zs));
+     robj *o;
+ 
      zs->dict = dictCreate(&zsetDictType,NULL);
      zs->zsl = zslCreate();
-     return createObject(REDIS_ZSET,zs);
+     o = createObject(REDIS_ZSET,zs);
+     o->encoding = REDIS_ENCODING_SKIPLIST;
+     return o;
  }
  
 +robj *createZsetZiplistObject(void) {
 +    unsigned char *zl = ziplistNew();
 +    robj *o = createObject(REDIS_ZSET,zl);
 +    o->encoding = REDIS_ENCODING_ZIPLIST;
 +    return o;
 +}
 +
  void freeStringObject(robj *o) {
      if (o->encoding == REDIS_ENCODING_RAW) {
          sdsfree(o->ptr);
diff --cc src/redis.c
index 2b98d40c,9c726151..3d0f5378
--- a/src/redis.c
+++ b/src/redis.c
@@@ -821,10 -840,10 +840,12 @@@ void initServerConfig() 
      server.list_max_ziplist_entries = REDIS_LIST_MAX_ZIPLIST_ENTRIES;
      server.list_max_ziplist_value = REDIS_LIST_MAX_ZIPLIST_VALUE;
      server.set_max_intset_entries = REDIS_SET_MAX_INTSET_ENTRIES;
 +    server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES;
 +    server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE;
      server.shutdown_asap = 0;
      server.cache_flush_delay = 0;
+     server.cluster_enabled = 0;
+     server.cluster.configfile = zstrdup("nodes.conf");
  
      updateLRUClock();
      resetServerSaveParams();