t11-sqlite.c

Show log
Commit

Hash : 72a3fe42
Author :
Date : 2011-03-18T19:38:49

I broke your bindings

Hey. Apologies in advance -- I broke your bindings.

This is a major commit that includes a long-overdue redesign of the
whole object-database structure. This is expected to be the last major
external API redesign of the library until the first non-alpha release.

Please get your bindings up to date with these changes. They will be
included in the next minor release. Sorry again!

Major features include:

	- Real caching and refcounting on parsed objects
	- Real caching and refcounting on objects read from the ODB
	- Streaming writes & reads from the ODB
	- Single-method writes for all object types
	- The external API is now partially thread-safe

The speed increases are significant in all aspects, specially when
reading an object several times from the ODB (revwalking) and when
writing big objects to the ODB.

Here's a full changelog for the external API:

blob.h
------

	- Remove `git_blob_new`
	- Remove `git_blob_set_rawcontent`
	- Remove `git_blob_set_rawcontent_fromfile`
	- Rename `git_blob_writefile` -> `git_blob_create_fromfile`
	- Change `git_blob_create_fromfile`:
		The `path` argument is now relative to the repository's working dir
	- Add `git_blob_create_frombuffer`

commit.h
--------

	- Remove `git_commit_new`
	- Remove `git_commit_add_parent`
	- Remove `git_commit_set_message`
	- Remove `git_commit_set_committer`
	- Remove `git_commit_set_author`
	- Remove `git_commit_set_tree`

	- Add `git_commit_create`
	- Add `git_commit_create_v`
	- Add `git_commit_create_o`
	- Add `git_commit_create_ov`

tag.h
-----

	- Remove `git_tag_new`
	- Remove `git_tag_set_target`
	- Remove `git_tag_set_name`
	- Remove `git_tag_set_tagger`
	- Remove `git_tag_set_message`

	- Add `git_tag_create`
	- Add `git_tag_create_o`

tree.h
------

	- Change `git_tree_entry_2object`:
		New signature is `(git_object **object_out, git_repository *repo, git_tree_entry *entry)`

	- Remove `git_tree_new`
	- Remove `git_tree_add_entry`
	- Remove `git_tree_remove_entry_byindex`
	- Remove `git_tree_remove_entry_byname`
	- Remove `git_tree_clearentries`
	- Remove `git_tree_entry_set_id`
	- Remove `git_tree_entry_set_name`
	- Remove `git_tree_entry_set_attributes`

object.h
------------

	- Remove `git_object_new
	- Remove `git_object_write`

	- Change `git_object_close`:
		This method is now *mandatory*. Not closing an object causes a
		memory leak.

odb.h
-----

	- Remove type `git_rawobj`
	- Remove `git_rawobj_close`
	- Rename `git_rawobj_hash` -> `git_odb_hash`
	- Change `git_odb_hash`:
		New signature is `(git_oid *id, const void *data, size_t len, git_otype type)`

	- Add type `git_odb_object`
	- Add `git_odb_object_close`

	- Change `git_odb_read`:
		New signature is `(git_odb_object **out, git_odb *db, const git_oid *id)`
	- Change `git_odb_read_header`:
		New signature is `(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id)`
	- Remove `git_odb_write`
	- Add `git_odb_open_wstream`
	- Add `git_odb_open_rstream`

odb_backend.h
-------------

	- Change type `git_odb_backend`:
		New internal signatures are as follows

			int (* read)(void **, size_t *, git_otype *, struct git_odb_backend *, const git_oid *)
			int (* read_header)(size_t *, git_otype *, struct git_odb_backend *, const git_oid *)
			int (* writestream)(struct git_odb_stream **, struct git_odb_backend *, size_t, git_otype)
			int (* readstream)( struct git_odb_stream **, struct git_odb_backend *, const git_oid *)

	- Add type `git_odb_stream`
	- Add enum `git_odb_streammode`

Signed-off-by: Vicent Marti <tanoku@gmail.com>

Download

tests/t11-sqlite.c

/*
 * This file is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License, version 2,
 * as published by the Free Software Foundation.
 *
 * In addition to the permissions in the GNU General Public License,
 * the authors give you unlimited permission to link the compiled
 * version of this file into combinations with other programs,
 * and to distribute those combinations without any restriction
 * coming from the use of this file.  (The General Public License
 * restrictions do apply in other respects; for example, they cover
 * modification of the file, and distribution when not linked into
 * a combined executable.)
 *
 * This file is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; see the file COPYING.  If not, write to
 * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301, USA.
 */
#include "test_lib.h"


#ifdef GIT2_SQLITE_BACKEND
#include "t03-data.h"
#include "fileops.h"
#include "git2/odb_backend.h"


static int cmp_objects(raw_object *o1, raw_object *o2)
{
	if (o1->type != o2->type)
		return -1;
	if (o1->len != o2->len)
		return -1;
	if ((o1->len > 0) && (memcmp(o1->data, o2->data, o1->len) != 0))
		return -1;
	return 0;
}

static git_odb *open_sqlite_odb(void)
{
	git_odb *odb;
	git_odb_backend *sqlite;

	if (git_odb_new(&odb) < GIT_SUCCESS)
		return NULL;

	if (git_odb_backend_sqlite(&sqlite, ":memory") < GIT_SUCCESS)
		return NULL;

	if (git_odb_add_backend(odb, sqlite, 0) < GIT_SUCCESS)
		return NULL;

	return odb;
}

#define TEST_WRITE(PTR) {\
    git_odb *db; \
	git_oid id1, id2; \
    raw_object obj; \
	db = open_sqlite_odb(); \
	must_be_true(db != NULL); \
    must_pass(git_oid_mkstr(&id1, PTR.id)); \
    must_pass(git_odb_write(&id2, db, &PTR##_obj)); \
    must_be_true(git_oid_cmp(&id1, &id2) == 0); \
    must_pass(git_odb_read(&obj, db, &id1)); \
    must_pass(cmp_objects(&obj, &PTR##_obj)); \
    git_rawobj_close(&obj); \
    git_odb_close(db); \
}

BEGIN_TEST(sqlite0, "write a commit, read it back (sqlite backend)")
	TEST_WRITE(commit);
END_TEST

BEGIN_TEST(sqlite1, "write a tree, read it back (sqlite backend)")
	TEST_WRITE(tree);
END_TEST

BEGIN_TEST(sqlite2, "write a tag, read it back (sqlite backend)")
	TEST_WRITE(tag);
END_TEST

BEGIN_TEST(sqlite3, "write a zero-byte entry, read it back (sqlite backend)")
	TEST_WRITE(zero);
END_TEST

BEGIN_TEST(sqlite4, "write a one-byte entry, read it back (sqlite backend)")
	TEST_WRITE(one);
END_TEST

BEGIN_TEST(sqlite5, "write a two-byte entry, read it back (sqlite backend)")
	TEST_WRITE(two);
END_TEST

BEGIN_TEST(sqlite6, "write some bytes in an entry, read it back (sqlite backend)")
	TEST_WRITE(some);
END_TEST


BEGIN_SUITE(sqlite)
	ADD_TEST(sqlite0);
	ADD_TEST(sqlite1);
	ADD_TEST(sqlite2);
	ADD_TEST(sqlite3);
	ADD_TEST(sqlite4);
	ADD_TEST(sqlite5);
	ADD_TEST(sqlite6);
END_SUITE

#else /* no sqlite builtin */
BEGIN_SUITE(sqlite)
	/* empty */
END_SUITE
#endif

Download

thodg/libgit2/tests/t11-sqlite.c

Commit

tests/t11-sqlite.c