Navigation Menu

Skip to content

Commit

Permalink
Enable subrecords functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@daijiro
daijiro committed Jun 18, 2013
1 parent 19b8ebb commit 9c5f474
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 44 deletions.
96 changes: 60 additions & 36 deletions lib/db.c
View file
Expand Up @@ -730,14 +730,15 @@ grn_table_create_validate(grn_ctx *ctx, const char *name, unsigned int name_size
return ctx->rc;
}

grn_obj *
grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
const char *path, grn_obj_flags flags,
grn_obj *key_type, grn_obj *value_type)
static grn_obj *
grn_table_create_with_value_size(grn_ctx *ctx, const char *name,
unsigned int name_size, const char *path,
grn_obj_flags flags, grn_obj *key_type,
grn_obj *value_type, uint32_t value_size)
{
grn_id id;
grn_id domain = GRN_ID_NIL, range = GRN_ID_NIL;
uint32_t key_size, value_size, max_n_subrecs;
uint32_t key_size, max_n_subrecs;
uint8_t subrec_size, subrec_offset;
grn_obj *res = NULL;
grn_obj *db;
Expand All @@ -746,18 +747,17 @@ grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
ERR(GRN_INVALID_ARGUMENT, "[table][create] db not initialized");
return NULL;
}
GRN_API_ENTER;
if (grn_db_check_name(ctx, name, name_size)) {
GRN_DB_CHECK_NAME_ERR("[table][create]", name, name_size);
GRN_API_RETURN(NULL);
return NULL;
}
if (!GRN_DB_P(db)) {
ERR(GRN_INVALID_ARGUMENT, "[table][create] invalid db assigned");
GRN_API_RETURN(NULL);
return NULL;
}
if (grn_table_create_validate(ctx, name, name_size, path, flags,
key_type, value_type)) {
GRN_API_RETURN(NULL);
return NULL;
}
if (key_type) {
domain = DB_OBJ(key_type)->id;
Expand All @@ -777,7 +777,7 @@ grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
name_size, name,
type_name_size, type_name,
key_size, GRN_TABLE_MAX_KEY_SIZE);
GRN_API_RETURN(NULL);
return NULL;
}
}
break;
Expand All @@ -796,7 +796,7 @@ grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
ERR(GRN_INVALID_ARGUMENT,
"[table][create] key type must be type or table: <%.*s> (%.*s)",
name_size, name, key_name_size, key_name);
GRN_API_RETURN(NULL);
return NULL;
}
break;
}
Expand All @@ -817,7 +817,7 @@ grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
ERR(GRN_INVALID_ARGUMENT,
"[table][create] value type must be fixed size: <%.*s> (%.*s)",
name_size, name, type_name_size, type_name);
GRN_API_RETURN(NULL);
return NULL;
}
value_size = GRN_TYPE_SIZE(t);
}
Expand All @@ -837,16 +837,14 @@ grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
ERR(GRN_INVALID_ARGUMENT,
"[table][create] value type must be type or table: <%.*s> (%.*s)",
name_size, name, value_name_size, value_name);
GRN_API_RETURN(NULL);
return NULL;
}
break;
}
} else {
value_size = 0;
}

id = grn_obj_register(ctx, db, name, name_size);
if (ERRP(ctx, GRN_ERROR)) { GRN_API_RETURN(NULL); }
if (ERRP(ctx, GRN_ERROR)) { return NULL; }
if (GRN_OBJ_PERSISTENT & flags) {
GRN_LOG(ctx, GRN_LOG_NOTICE, "DDL:table_create %.*s", name_size, name);
if (!path) {
Expand All @@ -855,19 +853,19 @@ grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
path = buffer;
} else {
ERR(GRN_INVALID_ARGUMENT, "path not assigned for persistent table");
GRN_API_RETURN(NULL);
return NULL;
}
} else {
flags |= GRN_OBJ_CUSTOM_NAME;
}
} else {
if (path) {
ERR(GRN_INVALID_ARGUMENT, "path assigned for temporary table");
GRN_API_RETURN(NULL);
return NULL;
}
if (GRN_DB_PERSISTENT_P(db) && name && name_size) {
ERR(GRN_INVALID_ARGUMENT, "name assigned for temporary table");
GRN_API_RETURN(NULL);
return NULL;
}
}
calc_rec_size(flags, &max_n_subrecs, &subrec_size,
Expand Down Expand Up @@ -908,7 +906,35 @@ grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
} else {
grn_obj_delete_by_id(ctx, db, id, GRN_TRUE);
}
GRN_API_RETURN(res);
return res;
}

grn_obj *
grn_table_create(grn_ctx *ctx, const char *name, unsigned int name_size,
const char *path, grn_obj_flags flags,
grn_obj *key_type, grn_obj *value_type)
{
grn_obj *res;
GRN_API_ENTER;
res = grn_table_create_with_value_size(ctx, name, name_size, path,
flags, key_type, value_type, 0);
GRN_API_RETURN(res);
}

grn_obj *
grn_table_create_for_group(grn_ctx *ctx, const char *name,
unsigned int name_size, const char *path,
grn_obj *group_key, unsigned int max_n_subrecs)
{
grn_obj *res;
grn_obj *key_type = grn_ctx_at(ctx, grn_obj_get_range(ctx, group_key));
GRN_API_ENTER;
res = grn_table_create_with_value_size(ctx, name, name_size, path,
GRN_TABLE_HASH_KEY|
GRN_OBJ_WITH_SUBREC|
GRN_OBJ_UNIT_USERDEF_DOCUMENT,
key_type, NULL, max_n_subrecs);
GRN_API_RETURN(res);
}

grn_obj *
Expand Down Expand Up @@ -2768,7 +2794,8 @@ accelerated_table_group(grn_ctx *ctx, grn_obj *table, grn_obj *key, grn_obj *res
}
if ((!idp || *((grn_id *)v)) &&
grn_table_add_v_inline(ctx, res, v, element_size, &value, NULL)) {
grn_table_add_subrec_inline(res, value, ri ? ri->score : 0, NULL, 0);
grn_table_add_subrec_inline(res, value, ri ? ri->score : 0,
(grn_rset_posinfo *)id_, 0);
}
}
GRN_RA_CACHE_FIN(ra, &cache);
Expand All @@ -2793,7 +2820,8 @@ accelerated_table_group(grn_ctx *ctx, grn_obj *table, grn_obj *key, grn_obj *res
while (len) {
if ((*v != GRN_ID_NIL) &&
grn_table_add_v_inline(ctx, res, v, sizeof(grn_id), &value, NULL)) {
grn_table_add_subrec_inline(res, value, ri ? ri->score : 0, NULL, 0);
grn_table_add_subrec_inline(res, value, ri ? ri->score : 0,
(grn_rset_posinfo *)id_, 0);
}
v++;
len -= sizeof(grn_id);
Expand Down Expand Up @@ -2867,7 +2895,8 @@ grn_table_group_with_range_gap(grn_ctx *ctx, grn_obj *table,
}
if (id) {
grn_table_add_subrec_inline(res, value,
ri ? ri->score : 0, NULL, 0);
ri ? ri->score : 0,
(grn_rset_posinfo *)&id, 0);
}
}
}
Expand All @@ -2893,7 +2922,8 @@ grn_table_group_with_range_gap(grn_ctx *ctx, grn_obj *table,
while (len) {
if ((*v != GRN_ID_NIL) &&
grn_table_add_v_inline(ctx, res, v, sizeof(grn_id), &value, NULL)) {
grn_table_add_subrec_inline(res, value, ri ? ri->score : 0, NULL, 0);
grn_table_add_subrec_inline(res, value, ri ? ri->score : 0,
(grn_rset_posinfo *)id_, 0);
}
v++;
len -= sizeof(grn_id);
Expand Down Expand Up @@ -2971,7 +3001,8 @@ grn_table_group(grn_ctx *ctx, grn_obj *table,
while (v < ve) {
if ((*v != GRN_ID_NIL) &&
grn_table_add_v_inline(ctx, results->table, v, sizeof(grn_id), &value, NULL)) {
grn_table_add_subrec_inline(results->table, value, ri ? ri->score : 0, NULL, 0);
grn_table_add_subrec_inline(results->table, value, ri ? ri->score : 0,
(grn_rset_posinfo *)&id, 0);
}
v++;
}
Expand All @@ -2986,7 +3017,8 @@ grn_table_group(grn_ctx *ctx, grn_obj *table,
if ((!idp || *((grn_id *)GRN_BULK_HEAD(&bulk))) &&
grn_table_add_v_inline(ctx, results->table,
GRN_BULK_HEAD(&bulk), GRN_BULK_VSIZE(&bulk), &value, NULL)) {
grn_table_add_subrec_inline(results->table, value, ri ? ri->score : 0, NULL, 0);
grn_table_add_subrec_inline(results->table, value, ri ? ri->score : 0,
(grn_rset_posinfo *)&id, 0);
}
}
break;
Expand Down Expand Up @@ -3020,7 +3052,8 @@ grn_table_group(grn_ctx *ctx, grn_obj *table,
key = GRN_BULK_HEAD(&bulk) + begin;
// todo : cut off GRN_ID_NIL
if (grn_table_add_v_inline(ctx, rp->table, key, end - begin, &value, NULL)) {
grn_table_add_subrec_inline(rp->table, value, ri ? ri->score : 0, NULL, 0);
grn_table_add_subrec_inline(rp->table, value, ri ? ri->score : 0,
(grn_rset_posinfo *)&id, 0);
}
}
}
Expand Down Expand Up @@ -4164,15 +4197,6 @@ grn_obj_get_accessor(grn_ctx *ctx, grn_obj *obj, const char *name, unsigned int
GRN_API_RETURN((grn_obj *)res);
}

grn_obj *
grn_table_create_for_group(grn_ctx *ctx, const char *name, unsigned int name_size,
const char *path, grn_obj_flags flags,
grn_obj *group_key, grn_obj *value_type)
{
grn_obj *key_type = grn_ctx_at(ctx, grn_obj_get_range(ctx, group_key));
return grn_table_create(ctx, name, name_size, path, flags, key_type, value_type);
}

inline static grn_bool
grn_column_is_vector(grn_ctx *ctx, grn_obj *column)
{
Expand Down
3 changes: 1 addition & 2 deletions lib/db.h
View file
Expand Up @@ -424,9 +424,8 @@ GRN_API grn_obj *grn_table_create_for_group(grn_ctx *ctx,
const char *name,
unsigned int name_size,
const char *path,
grn_obj_flags flags,
grn_obj *group_key,
grn_obj *value_type);
unsigned int max_n_subrecs);

#define KEY_NAME "_key"
#define ID_NAME "_id"
Expand Down
3 changes: 1 addition & 2 deletions lib/proc.c
View file
Expand Up @@ -701,8 +701,7 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len,
if (gkeys) {
for (i = 0; i < ngkeys; i++) {
if ((g.table = grn_table_create_for_group(ctx, NULL, 0, NULL,
GRN_TABLE_HASH_KEY|GRN_OBJ_WITH_SUBREC,
gkeys[i].key, NULL))) {
gkeys[i].key, 0))) {
int n_drilldown_offset = drilldown_offset,
n_drilldown_limit = drilldown_limit;

Expand Down
5 changes: 1 addition & 4 deletions plugins/table/table.c
View file
Expand Up @@ -248,10 +248,7 @@ command_group(grn_ctx *ctx, int nargs, grn_obj **args,
if (set_len) {
set_ = grn_ctx_get_table_by_name_or_id(ctx, set, set_len);
} else {
set_ = grn_table_create_for_group(ctx, NULL, 0, NULL,
GRN_TABLE_HASH_KEY|
GRN_OBJ_WITH_SUBREC,
gkeys[0].key, NULL);
set_ = grn_table_create_for_group(ctx, NULL, 0, NULL, gkeys[0].key, 0);
}
if (set_) {
if (GRN_TEXT_LEN(VAR(3))) {
Expand Down

0 comments on commit 9c5f474

Please sign in to comment.