addons/AVCodec/samples/video2.io2 addons/CGI/tests/CGITest.io addons/DistributedObjects/build.io addons/DistributedObjects/depends addons/DistributedObjects/io/DOConnection.io addons/DistributedObjects/io/DOServer.io addons/DistributedObjects/samples/DOTest.io addons/DistributedObjects/tests/DOTest.io addons/DistributedObjects/tests/run.io addons/Image/samples/images/lotus_t.jpg addons/Image/samples/images/lotus_t.png addons/NullAddon/build.io addons/NullAddon/depends addons/NullAddon/source/IoNullAddon.c addons/NullAddon/source/IoNullAddon.h addons/Obsidian/build.io addons/Obsidian/depends addons/Obsidian/io/QStore.io addons/Obsidian/protos addons/QDBM/tests/testPath.io addons/SGML/source/libsgml/Makefile addons/SGML/source/libsgml/examples/Makefile addons/SGML/source/libsgml/src/Makefile addons/Socket/samples/MiniEmailServer.io addons/TokyoCabinet/source/IoTokyoCabinetPrefixCursor.c addons/TokyoCabinet/source/IoTokyoCabinetPrefixCursor.h addons/TokyoCabinet/test.db @@ -1,7 +1,6 @@ -/* -//metadoc copyright Steve Dekorte 2002 -*/ -*/ + +//metadoc Thread copyright Steve Dekorte 2002 + #ifndef IOTHREAD_DEFINED #define IOTHREAD_DEFINED 1 addons/Thread/source/IoThread.h @@ -1,23 +1,30 @@ TokyoCabinet do( - newSlot("path", "default.tc") - + //doc TokyoCabinet path Returns the path of the database file. + //doc TokyoCabinet setPath(aPath) Sets the path of the database file. Returns self. + path ::= "default.tc" + + //doc TokyoCabinet _open Private. _open := getSlot("open") open := method(p, opt, if(p, setPath(p)) if(opt, _open(path, opt), _open(path)) ) + //doc TokyoCabinet transactionalAtPut(key, value) Transactionally insert the given key and value. Returns self. transactionalAtPut := method(k, v, self begin self atPut(k, v) self commit + self ) + //doc TokyoCabinet transactionalRemoveAt(key) Transactionally remove the given key. Returns self. transactionalRemoveAt := method(k, self begin self removeAt(k) self commit + self ) ) addons/TokyoCabinet/io/TokyoCabinet.io @@ -177,6 +177,7 @@ IoTokyoCabinet *IoTokyoCabinet_proto(void *state) {"close", IoTokyoCabinet_close}, {"atPut", IoTokyoCabinet_atPut}, + {"atAppend", IoTokyoCabinet_atAppend}, {"at", IoTokyoCabinet_at}, {"sizeAt", IoTokyoCabinet_sizeAt}, {"removeAt", IoTokyoCabinet_removeAt}, @@ -245,6 +246,8 @@ IoObject *IoTokyoCabinet_open(IoObject *self, IoObject *locals, IoMessage *m) IoSeq *path = IoMessage_locals_seqArgAt_(m, locals, 0); BDBCMP cf = pathCompareFunc; + IoTokyoCabinet_close(self, locals, m); + if(IoMessage_argCount(m) > 1) { IoSeq *compareType = IoMessage_locals_seqArgAt_(m, locals, 1); @@ -262,7 +265,9 @@ IoObject *IoTokyoCabinet_open(IoObject *self, IoObject *locals, IoMessage *m) } } - tcbdbsetcmpfunc(TokyoCabinet(self), cf, NULL); + //tcbdbsetcmpfunc(TokyoCabinet(self), cf, NULL); + + IoObject_setDataPointer_(self, tcbdbnew()); if(!tcbdbopen(TokyoCabinet(self), CSTRING(path), BDBOWRITER | BDBOCREAT | BDBOLCKNB)) { @@ -393,6 +398,27 @@ IoObject *IoTokyoCabinet_atPut(IoObject *self, IoObject *locals, IoMessage *m) return self; } +IoObject *IoTokyoCabinet_atAppend(IoObject *self, IoObject *locals, IoMessage *m) +{ + /*doc TokyoCabinet atApple(keySymbol, valueSequence) + Appends valueSequence to the current value at keySymbol. Returns self. + */ + + IoSeq *key = IoMessage_locals_seqArgAt_(m, locals, 0); + IoSeq *value = IoMessage_locals_seqArgAt_(m, locals, 1); + int result; + + IOASSERT(TokyoCabinet(self), "invalid TokyoCabinet"); + + result = tcbdbputcat(TokyoCabinet(self), + (const void *)IoSeq_rawBytes(key), (int)IoSeq_rawSizeInBytes(key), + (const void *)IoSeq_rawBytes(value), (int)IoSeq_rawSizeInBytes(value)); + + IOASSERT(result, tcbdberrmsg(tcbdbecode(TokyoCabinet(self)))); + + return self; +} + IoObject *IoTokyoCabinet_at(IoObject *self, IoObject *locals, IoMessage *m) { /*doc TokyoCabinet at(keySymbol) addons/TokyoCabinet/source/IoTokyoCabinet.c @@ -28,6 +28,7 @@ void IoTokyoCabinet_free(IoObject *self); IoObject *IoTokyoCabinet_open(IoObject *self, IoObject *locals, IoMessage *m); IoObject *IoTokyoCabinet_close(IoObject *self, IoObject *locals, IoMessage *m); IoObject *IoTokyoCabinet_atPut(IoObject *self, IoObject *locals, IoMessage *m); +IoObject *IoTokyoCabinet_atAppend(IoObject *self, IoObject *locals, IoMessage *m); IoObject *IoTokyoCabinet_at(IoObject *self, IoObject *locals, IoMessage *m); IoObject *IoTokyoCabinet_sizeAt(IoObject *self, IoObject *locals, IoMessage *m); IoObject *IoTokyoCabinet_removeAt(IoObject *self, IoObject *locals, IoMessage *m); addons/TokyoCabinet/source/IoTokyoCabinet.h @@ -1,7 +1,6 @@ TokyoCabinet TokyoCabinet := UnitTest clone do( - cleanUp := method( File with("test.db") remove ) addons/TokyoCabinet/tests/TokyoCabinetTest.io @@ -9,7 +9,6 @@ ZlibDecoderTest := UnitTest clone do( z beginProcessing z process z endProcessing - //z outputBuffer println s := "TestSuite clone setPath(System launchPath) run" assertTrue(z outputBuffer containsSeq(s)) ) addons/Zlib/tests/ZlibTest.io addons/Zlib/tests/test.gz @@ -431,6 +431,6 @@ AddonBuilder := Object clone do( ) cleanDocs := method( - systemCall("rm -f io/zzz_docs.io") + systemCall("rm -f docs/docs.txt") ) ) build/AddonBuilder.io @@ -131,7 +131,7 @@ clean: -rm -rf _build test: - ./_build/binaries/io_static$(BINARY_SUFFIX) ../libs/iovm/tests/run.io + ./_build/binaries/io_static$(BINARY_SUFFIX) ../libs/iovm/tests/run.io || true docs: ./io_static$(BINARY_SUFFIX) _docgen/DocsExtractor.io . tools/Makefile addons/SQLite/tests/DBMTest.io addons/SQLite/tests/ZSoupTest.io addons/Socket/io/DOConnection.io addons/Socket/io/DOServer.io addons/Socket/samples/DOTest.io addons/Socket/tests/DOTest.io addons/Socket/tests/run.io addons/TokyoCabinet/docs/docs.txt eecbcf39c4db596ee026e8fd5f6685efe110d7a8 Steve Dekorte steve@StevesLaptop.local http://github.com/stevedekorte/io/commit/8b0095e4b65c96d274a2f36b3d6ca180c4f1592b 8b0095e4b65c96d274a2f36b3d6ca180c4f1592b 2008-03-02T14:31:57-08:00 2008-03-02T14:31:57-08:00 Moved DistributedObjects to an addon, TokyoCabinet updates, unit test fixes 753006a923b568c5afae2a3054569c7bb1542376 Steve Dekorte steve@StevesLaptop.local