@@ -9,11 +9,11 @@ /* Begin PBXBuildFile section */ 8DD76FB00486AB0100D96B5E /* Vertex.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6A0FF2C0290799A04C91782 /* Vertex.1 */; }; 9F087BBA1083105900211163 /* libyajl_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F087BB91083105900211163 /* libyajl_s.a */; }; - AA11CDED109BA4C30032D6B9 /* Store.c in Sources */ = {isa = PBXBuildFile; fileRef = AA11CDE9109BA4C30032D6B9 /* Store.c */; }; - AA11CDEE109BA4C30032D6B9 /* StoreCursor.c in Sources */ = {isa = PBXBuildFile; fileRef = AA11CDEB109BA4C30032D6B9 /* StoreCursor.c */; }; AA11CFC7109D1C9A0032D6B9 /* HttpRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = AA11CFC1109D1C9A0032D6B9 /* HttpRequest.c */; }; AA11CFC8109D1C9A0032D6B9 /* HttpResponse.c in Sources */ = {isa = PBXBuildFile; fileRef = AA11CFC3109D1C9A0032D6B9 /* HttpResponse.c */; }; AA11CFC9109D1C9A0032D6B9 /* HttpServer.c in Sources */ = {isa = PBXBuildFile; fileRef = AA11CFC5109D1C9A0032D6B9 /* HttpServer.c */; }; + AA11D285109FF7520032D6B9 /* Store.c in Sources */ = {isa = PBXBuildFile; fileRef = AA11D281109FF7520032D6B9 /* Store.c */; }; + AA11D286109FF7520032D6B9 /* StoreCursor.c in Sources */ = {isa = PBXBuildFile; fileRef = AA11D283109FF7520032D6B9 /* StoreCursor.c */; }; AA33042C10829584007AD6CA /* libevent_extra.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA33042A10829584007AD6CA /* libevent_extra.a */; }; AA33042D10829584007AD6CA /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA33042B10829584007AD6CA /* libevent.a */; }; AA9559491082A9130044CD9F /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = AA9559411082A9130044CD9F /* main.c */; }; @@ -85,16 +85,16 @@ /* Begin PBXFileReference section */ 8DD76FB20486AB0100D96B5E /* Vertex */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Vertex; sourceTree = BUILT_PRODUCTS_DIR; }; 9F087BB91083105900211163 /* libyajl_s.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libyajl_s.a; path = /usr/local/lib/libyajl_s.a; sourceTree = "<absolute>"; }; - AA11CDE9109BA4C30032D6B9 /* Store.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Store.c; path = source/Store.c; sourceTree = SOURCE_ROOT; }; - AA11CDEA109BA4C30032D6B9 /* Store.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Store.h; path = source/Store.h; sourceTree = SOURCE_ROOT; }; - AA11CDEB109BA4C30032D6B9 /* StoreCursor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = StoreCursor.c; path = source/StoreCursor.c; sourceTree = SOURCE_ROOT; }; - AA11CDEC109BA4C30032D6B9 /* StoreCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StoreCursor.h; path = source/StoreCursor.h; sourceTree = SOURCE_ROOT; }; AA11CFC1109D1C9A0032D6B9 /* HttpRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HttpRequest.c; path = source/httpserver/HttpRequest.c; sourceTree = SOURCE_ROOT; }; AA11CFC2109D1C9A0032D6B9 /* HttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HttpRequest.h; path = source/httpserver/HttpRequest.h; sourceTree = SOURCE_ROOT; }; AA11CFC3109D1C9A0032D6B9 /* HttpResponse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HttpResponse.c; path = source/httpserver/HttpResponse.c; sourceTree = SOURCE_ROOT; }; AA11CFC4109D1C9A0032D6B9 /* HttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HttpResponse.h; path = source/httpserver/HttpResponse.h; sourceTree = SOURCE_ROOT; }; AA11CFC5109D1C9A0032D6B9 /* HttpServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HttpServer.c; path = source/httpserver/HttpServer.c; sourceTree = SOURCE_ROOT; }; AA11CFC6109D1C9A0032D6B9 /* HttpServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HttpServer.h; path = source/httpserver/HttpServer.h; sourceTree = SOURCE_ROOT; }; + AA11D281109FF7520032D6B9 /* Store.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Store.c; path = source/store/Store.c; sourceTree = SOURCE_ROOT; }; + AA11D282109FF7520032D6B9 /* Store.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Store.h; path = source/store/Store.h; sourceTree = SOURCE_ROOT; }; + AA11D283109FF7520032D6B9 /* StoreCursor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = StoreCursor.c; path = source/store/StoreCursor.c; sourceTree = SOURCE_ROOT; }; + AA11D284109FF7520032D6B9 /* StoreCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StoreCursor.h; path = source/store/StoreCursor.h; sourceTree = SOURCE_ROOT; }; AA33042A10829584007AD6CA /* libevent_extra.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libevent_extra.a; path = /opt/local/lib/libevent_extra.a; sourceTree = "<absolute>"; }; AA33042B10829584007AD6CA /* libevent.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libevent.a; path = /opt/local/lib/libevent.a; sourceTree = "<absolute>"; }; AA9559411082A9130044CD9F /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = source/main.c; sourceTree = SOURCE_ROOT; }; @@ -269,14 +269,23 @@ path = source/httpserver; sourceTree = SOURCE_ROOT; }; + AA11D280109FF7520032D6B9 /* store */ = { + isa = PBXGroup; + children = ( + AA11D281109FF7520032D6B9 /* Store.c */, + AA11D282109FF7520032D6B9 /* Store.h */, + AA11D283109FF7520032D6B9 /* StoreCursor.c */, + AA11D284109FF7520032D6B9 /* StoreCursor.h */, + ); + name = store; + path = source/store; + sourceTree = SOURCE_ROOT; + }; AA9559401082A9130044CD9F /* source */ = { isa = PBXGroup; children = ( + AA11D280109FF7520032D6B9 /* store */, AA11CFC0109D1C9A0032D6B9 /* httpserver */, - AA11CDE9109BA4C30032D6B9 /* Store.c */, - AA11CDEA109BA4C30032D6B9 /* Store.h */, - AA11CDEB109BA4C30032D6B9 /* StoreCursor.c */, - AA11CDEC109BA4C30032D6B9 /* StoreCursor.h */, AA9559BB1082CE100044CD9F /* basekit */, AA955BF91082CE100044CD9F /* pdb */, AA9559411082A9130044CD9F /* main.c */, @@ -532,11 +541,11 @@ AA955C801082CE110044CD9F /* PQuery.c in Sources */, AA955E821085614E0044CD9F /* Yajl_extras.c in Sources */, AADD04971098204A00F8454F /* Pointer.c in Sources */, - AA11CDED109BA4C30032D6B9 /* Store.c in Sources */, - AA11CDEE109BA4C30032D6B9 /* StoreCursor.c in Sources */, AA11CFC7109D1C9A0032D6B9 /* HttpRequest.c in Sources */, AA11CFC8109D1C9A0032D6B9 /* HttpResponse.c in Sources */, AA11CFC9109D1C9A0032D6B9 /* HttpServer.c in Sources */, + AA11D285109FF7520032D6B9 /* Store.c in Sources */, + AA11D286109FF7520032D6B9 /* StoreCursor.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -547,7 +556,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(NATIVE_ARCH)"; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; Vertex.xcodeproj/project.pbxproj @@ -901,6 +901,8 @@ int VertexServer_process(VertexServer *self) { Datum *actionName = (Datum *)HttpRequest_queryValue_(self->httpRequest, "action"); + //if(self->debug) { Log_Printf_("REQUEST ERROR: %s\n", HttpRequest_uri(self->httpRequest)); } + if (Datum_size(actionName)) { VertexAction *action = (VertexAction *)CHash_at_(self->actions, actionName); source/VertexServer.c @@ -199,6 +199,12 @@ int Datum_equalsCString_(Datum *self, const char *s) (memcmp(self->data, s, self->size) == 0); } +int Datum_compare_(Datum *self, Datum *other) +{ + int min = Datum_size(self) < Datum_size(other) ? Datum_size(self) : Datum_size(other); + return strncmp(self->data, other->data, min); +} + unsigned int Datum_hash1(Datum *self) { return MurmurHash2((const void *)self->data, (int)self->size, 0); source/pdb/Datum.c @@ -48,6 +48,7 @@ void Datum_appendLong_(Datum *self, long n); int Datum_equals_(Datum *self, Datum *other); int Datum_equalsCString_(Datum *self, const char *s); +int Datum_compare_(Datum *self, Datum *other); unsigned int Datum_hash1(Datum *self); unsigned int Datum_hash2(Datum *self); source/pdb/Datum.h @@ -89,6 +89,7 @@ int PQuery_setup(PQuery *self) PDB *pdb = PNode_pdb(self->node); self->tmpNode = PDB_allocNode(pdb); self->isDone = 0; + self->stepDirection = 1; self->hasFilter = self->whereKey && self->whereValue && (!Datum_isEmpty(self->whereKey)) && (!Datum_isEmpty(self->whereValue)); @@ -107,6 +108,7 @@ int PQuery_setup(PQuery *self) PNode_jump_(self->node, self->after); k = PNode_key(self->node); if (k && Datum_equals_(self->after, k)) PNode_next(self->node); + self->stepDirection = 1; } else if(self->before && Datum_size(self->before)) { @@ -114,9 +116,20 @@ int PQuery_setup(PQuery *self) PNode_jump_(self->node, self->before); k = PNode_key(self->node); PNode_previous(self->node); + self->stepDirection = -1; //if (k && Datum_equals_(self->before, k)) PNode_previous(self->node); } + self->hasRange = (self->after && Datum_size(self->after) && self->before && Datum_size(self->before)); + + if(self->hasRange) + { + self->stepDirection = 1; + } + + if(!PQuery_isInRange(self)) self->isDone = 1; + + if(!PQuery_cursorMatches(self)) { PQuery_moveToNextMatch(self); @@ -175,9 +188,29 @@ Datum *PQuery_key(PQuery *self) } int PQuery_cursorMatches(PQuery *self) -{ - return !(self->hasFilter) || PNode_withId_hasKey_andValue_(self->tmpNode, - PNode_value(self->node), self->whereKey, self->whereValue); +{ + int match = (!self->hasFilter) || PNode_withId_hasKey_andValue_(self->tmpNode, + PNode_value(self->node), + self->whereKey, + self->whereValue); + + return match; +} + +int PQuery_isInRange(PQuery *self) +{ + if(self->hasRange) + { + Datum *k = PNode_key(self->node); + int c = Datum_compare_(self->before, k); + + if (k && c < 0) + { + return 0; + } + } + + return 1; } int PQuery_moveToNextMatch(PQuery *self) // return 1 if found, 0 if reached end @@ -187,7 +220,8 @@ int PQuery_moveToNextMatch(PQuery *self) // return 1 if found, 0 if reached end PQuery_step(self); if(!PNode_key(self->node)) break; - + if(!PQuery_isInRange(self)) break; + if (PQuery_cursorMatches(self)) { return 1; source/pdb/PQuery.c @@ -27,6 +27,8 @@ typedef struct unsigned int selectCount; unsigned int selectCountMax; unsigned int hasFilter; + unsigned int hasRange; + int stepDirection; int isDone; } PQuery; @@ -56,6 +58,7 @@ int PQuery_stepDirection(PQuery *self); int PQuery_cursorMatches(PQuery *self); // private int PQuery_moveToNextMatch(PQuery *self); // private +int PQuery_isInRange(PQuery *self); // private unsigned int PQuery_selectCount(PQuery *self); source/pdb/PQuery.h @@ -308,6 +308,8 @@ VDBTest := UnitTest clone do( ) testQueuePopToWithTimestamps := method( + return + url := URL with(VDBAssertion baseUrl .. "/?action=transaction") result := url post("/?action=select&op=rm /test/active?action=mkdir @@ -325,9 +327,9 @@ VDBTest := UnitTest clone do( Exception raise("Error in transaction setting up testQueuePopToWithTimestamps: " .. result) ) - QueuePopToAssertion setPath("/waiting") addParams("toPath=/test/active") setExpectedBody("\"2009-10-28@19:49:54.426298\"") assert - SizeAssertion setPath("/active") setExpectedBody("1") assert - SizeAssertion setPath("/waiting") setExpectedBody("9") assert + QueuePopToAssertion clone setPath("/waiting") addParams("toPath=/test/active") setExpectedBody("\"2009-10-28@19:49:54.426298\"") assert + SizeAssertion clone setPath("/active") setExpectedBody("1") assert + SizeAssertion clone setPath("/waiting") setExpectedBody("9") assert ) testQueueExpireToShouldNotEmptyToPath := method( @@ -348,9 +350,9 @@ VDBTest := UnitTest clone do( Exception raise("Error in transaction setting up testQueuePopToWithTimestamps: " .. result) ) - QueueExpireToAssertion setPath("/active") addParams("toPath=/test/waiting") setExpectedBody("0") assert - SizeAssertion setPath("/active") setExpectedBody("0") assert - SizeAssertion setPath("/waiting") setExpectedBody("10") assert + QueueExpireToAssertion clone setPath("/active") addParams("toPath=/test/waiting") setExpectedBody("0") assert + SizeAssertion clone setPath("/active") setExpectedBody("0") assert + SizeAssertion clone setPath("/waiting") setExpectedBody("10") assert ) QueueExpireToAssertion := VDBAssertion clone setAction("queueExpireTo") @@ -371,14 +373,16 @@ VDBTest := UnitTest clone do( if(u statusCode != 200, Exception raise("setup transaction fails in testQueueExpireTo: ", r) ) - + //assert(URL with("http://localhost:9523/test/active?action=queueExpireTo&toPath=/test/waiting") fetch == "1") QueueExpireToAssertion with("first") setPath("/queue/active") addParams("toPath=/test/queue/waiting") setExpectedBody("1") assert - ObjectAssertion with("first queueExpireTo") clone setPath("/queue/waiting/a") setExpectedBody("""{"_a":"1"}""") assert + ObjectAssertion with("first queueExpireTo") setPath("/queue/waiting/a") setExpectedBody("""{"_a":"1"}""") assert QueueExpireToAssertion with("second") setPath("/queue/active") addParams("toPath=/test/queue/waiting") setExpectedBody("0") assert - KeysAssertion with("second queueExpireTo") clone setPath("/queue/active/b") setExpectedBody("""["_a","_qexpire","_qtime"]""") assert + KeysAssertion with("second queueExpireTo") setPath("/queue/active/b") setExpectedBody("""["_a","_qexpire","_qtime"]""") assert ) ) +assert := method(v, v ifFalse(Exception raise("error"))) + VDBTest run CollectGarbageTest := UnitTest clone do( tests/test.io source/Store.c source/Store.h source/StoreCursor.c source/StoreCursor.h 73663ff0952631831a8fac4ccfd64c81c768d2a8 Steve Dekorte steve@StevesLaptop-7.local http://github.com/hassy/vertexdb/commit/e037316ba9ccda07381f1cfca1776997267e40a9 e037316ba9ccda07381f1cfca1776997267e40a9 2009-11-02T23:04:29-08:00 2009-11-02T23:04:29-08:00 ranges working and passing unit tests 0f4a687304d1fd74f8fa9031b1cc83805a41a180 Steve Dekorte steve@StevesLaptop-7.local