Release notes updated with the new 2.6 features.

[redis.git] / src / sds.h

diff --git a/src/sds.h b/src/sds.h
index 6a3178688f5040af7572deb72f628d507cabe4ee..0648381bb9a74a72382a5dc5dd67b9c15badf7d3 100644 (file)
--- a/src/sds.h
+++ b/src/sds.h
@@ -31,6 +31,8 @@
 #ifndef __SDS_H
 #define __SDS_H
 
 #ifndef __SDS_H
 #define __SDS_H
 

+#define SDS_MAX_PREALLOC (1024*1024)
+

 #include <sys/types.h>
 #include <stdarg.h>
 
 #include <sys/types.h>
 #include <stdarg.h>
 


@@ -42,6 +44,16 @@ struct sdshdr {
     char buf[];
 };
 
     char buf[];
 };
 

+static inline size_t sdslen(const sds s) {
+    struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr)));
+    return sh->len;
+}
+
+static inline size_t sdsavail(const sds s) {
+    struct sdshdr *sh = (void*)(s-(sizeof(struct sdshdr)));
+    return sh->free;
+}
+

 sds sdsnewlen(const void *init, size_t initlen);
 sds sdsnew(const char *init);
 sds sdsempty();
 sds sdsnewlen(const void *init, size_t initlen);
 sds sdsnew(const char *init);
 sds sdsempty();


@@ -52,6 +64,7 @@ size_t sdsavail(sds s);
 sds sdsgrowzero(sds s, size_t len);
 sds sdscatlen(sds s, void *t, size_t len);
 sds sdscat(sds s, char *t);
 sds sdsgrowzero(sds s, size_t len);
 sds sdscatlen(sds s, void *t, size_t len);
 sds sdscat(sds s, char *t);

+sds sdscatsds(sds s, sds t);

 sds sdscpylen(sds s, char *t, size_t len);
 sds sdscpy(sds s, char *t);
 
 sds sdscpylen(sds s, char *t, size_t len);
 sds sdscpy(sds s, char *t);
 


@@ -66,6 +79,7 @@ sds sdscatprintf(sds s, const char *fmt, ...);
 sds sdstrim(sds s, const char *cset);
 sds sdsrange(sds s, int start, int end);
 void sdsupdatelen(sds s);
 sds sdstrim(sds s, const char *cset);
 sds sdsrange(sds s, int start, int end);
 void sdsupdatelen(sds s);

+void sdsclear(sds s);

 int sdscmp(sds s1, sds s2);
 sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count);
 void sdsfreesplitres(sds *tokens, int count);
 int sdscmp(sds s1, sds s2);
 sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count);
 void sdsfreesplitres(sds *tokens, int count);


@@ -75,5 +89,12 @@ sds sdsfromlonglong(long long value);
 sds sdscatrepr(sds s, char *p, size_t len);
 sds *sdssplitargs(char *line, int *argc);
 void sdssplitargs_free(sds *argv, int argc);
 sds sdscatrepr(sds s, char *p, size_t len);
 sds *sdssplitargs(char *line, int *argc);
 void sdssplitargs_free(sds *argv, int argc);

+sds sdsmapchars(sds s, char *from, char *to, size_t setlen);
+
+/* Low level functions exposed to the user API */
+sds sdsMakeRoomFor(sds s, size_t addlen);
+void sdsIncrLen(sds s, int incr);
+sds sdsRemoveFreeSpace(sds s);
+size_t sdsAllocSize(sds s);

 
 #endif
 
 #endif