Changeset: a5972dac1982 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5972dac1982
Modified Files:
monetdb5/extras/rdf/rdf_shredder.c
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql_rdf.c
sql/backends/monet5/sql_rdf_jgraph.c
Branch: rdf
Log Message:
More fix after merging with the default.
- Add rdf files into the Make file in sql/backends/monet5
- Modify the use of BATmirror, BATmark
diffs (203 lines):
diff --git a/monetdb5/extras/rdf/rdf_shredder.c
b/monetdb5/extras/rdf/rdf_shredder.c
--- a/monetdb5/extras/rdf/rdf_shredder.c
+++ b/monetdb5/extras/rdf/rdf_shredder.c
@@ -679,9 +679,7 @@ post_processing (parserData *pdata)
map_oid = BATmark(graph[MAP_LEX], 0); /* BATmark will create a copy */
BATorder(map_oid);
BATsetaccess(map_oid, BAT_READ); /* force BAtmark not to copy
bat */
- map_oid = BATmirror(BATmark(BATmirror(map_oid), 0));
BATsetaccess(graph[MAP_LEX], BAT_READ); /* force BATmark not to copy
bat */
- graph[MAP_LEX] = BATmirror(BATmark(BATmirror(graph[MAP_LEX]), 0));
/* convert old oids of S_sort, P_sort, O_sort to new ones */
cnt = BATcount(graph[S_sort]);
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -48,7 +48,8 @@ lib__sql = {
sql_cast_impl_up_to_int.h \
sql_round.c sql_round_impl.h sql_bat2time.c \
sql_fround.c sql_fround_impl.h \
- sql_rank.c sql_rank.h
+ sql_rank.c sql_rank.h \
+ sql_rdf.h sql_rdf.c sql_rdf_rel.h sql_rdf_rel.c
sql_rdf_jgraph.h sql_rdf_jgraph.c
LIBS = ../../server/libsqlserver \
../../storage/libstore \
../../storage/bat/libbatstore \
diff --git a/sql/backends/monet5/sql_rdf.c b/sql/backends/monet5/sql_rdf.c
--- a/sql/backends/monet5/sql_rdf.c
+++ b/sql/backends/monet5/sql_rdf.c
@@ -33,7 +33,6 @@
#include <rel_dump.h>
#include <rel_bin.h>
#include <bbp.h>
-#include <cluster.h>
#include <opt_pipes.h>
#include "clients.h"
#include "sql_rdf.h"
@@ -205,10 +204,10 @@ SQLrdfShred(Client cntxt, MalBlkPtr mb,
s = b[MAP_LEX];
store_funcs.append_col(m->session->tr,
mvc_bind_column(m, map_tbl, "lexical"),
- BATmirror(BATmark(BATmirror(s),0)), TYPE_bat);
+ s, TYPE_bat);
store_funcs.append_col(m->session->tr,
mvc_bind_column(m, map_tbl, "sid"),
- BATmirror(BATmark(s, 0)),
+ BATdense(s->hseqbase, s->hseqbase, BATcount(s)),
TYPE_bat);
BBPunfix(s->batCacheid);
@@ -1578,12 +1577,9 @@ static void refine_BAT_with_possible_tbl
if (tmptbid == curId){
//This row is possible candidate. Write tmps, tmpo to
the ret BATs
- if (BUNfastins(r_sbat, ATOMnilptr(TYPE_void), &tmps)==
GDK_FAIL){
- fprintf(stderr, "Cannot insert into r_sbat in
refine_BAT_with_possible_tblId \n");
- }
- if (BUNfastins(r_obat, ATOMnilptr(TYPE_void), &tmpo)==
GDK_FAIL){
- fprintf(stderr, "Cannot insert into r_obat in
refine_BAT_with_possible_tblId \n");
- }
+ bunfastapp(r_sbat, &tmps);
+
+ bunfastapp(r_obat, &tmpo);
} else {
continue;
}
@@ -1591,6 +1587,10 @@ static void refine_BAT_with_possible_tbl
*retsbat = r_sbat;
*retobat = r_obat;
+
+ bunins_failed:
+ fprintf(stderr, "refine_BAT_with_possible_tblId: Failed in fast
inserting\n");
+
}
#endif
@@ -2210,8 +2210,8 @@ SQLrdfScan(Client cntxt, MalBlkPtr mb, M
for (i = 0; i < (*nP); i++){
//BATprint(m_obats[i]);
- b[2*i] = BATcopy(m_sbat, m_sbat->htype, m_sbat->ttype,
FALSE, TRANSIENT);
- b[2*i+1] = BATcopy(m_obats[i], m_obats[i]->htype,
m_obats[i]->ttype, FALSE, TRANSIENT);
+ b[2*i] = COLcopy(m_sbat, m_sbat->ttype, FALSE,
TRANSIENT);
+ b[2*i+1] = COLcopy(m_obats[i], m_obats[i]->ttype,
FALSE, TRANSIENT);
}
eT1 = clock();
@@ -2468,8 +2468,8 @@ void getSlides_per_P(PsoPropStat *pso_ps
lo = lo_cst;
hi = hi_cst;
}
- //BATsubselect(inputbat, <dont know yet>,
lowValue, Highvalue, isIncludeLowValue, isIncludeHigh, <anti>
- tmpB = BATsubselect(tmp_o, NULL, &lo, &hi, 1,
1, 0);
+ //BATselect(inputbat, <dont know yet>,
lowValue, Highvalue, isIncludeLowValue, isIncludeHigh, <anti>
+ tmpB = BATselect(tmp_o, NULL, &lo, &hi, 1, 1,
0);
*ret_oBat = BATproject(tmpB, tmp_o);
*ret_sBat = BATproject(tmpB, tmp_s);
BBPunfix(tmpB->batCacheid);
diff --git a/sql/backends/monet5/sql_rdf_jgraph.c
b/sql/backends/monet5/sql_rdf_jgraph.c
--- a/sql/backends/monet5/sql_rdf_jgraph.c
+++ b/sql/backends/monet5/sql_rdf_jgraph.c
@@ -710,10 +710,10 @@ void handling_Union(mvc *c, sql_rel *rel
* Consider removing this function
* */
static
-char *get_relname_from_basetable(sql_rel *rel){
+const char *get_relname_from_basetable(sql_rel *rel){
sql_exp *tmpexp;
- char *rname = NULL;
+ const char *rname = NULL;
list *tmpexps;
assert(rel->op == op_basetable);
@@ -782,7 +782,7 @@ void free_nMap(nMap *nm){
free(nm);
}
static
-void add_to_nMap(nMap *nm, str s, int *id){
+void add_to_nMap(nMap *nm, const char* s, int *id){
BUN bun;
bun = BUNfnd(nm->lmap,(ptr) (str)s);
@@ -802,7 +802,7 @@ void add_to_nMap(nMap *nm, str s, int *i
}
static
-int rname_to_nodeId(nMap *nm, str rname){
+int rname_to_nodeId(nMap *nm, const char* rname){
int *id;
BUN bun;
bun = BUNfnd(nm->lmap,rname);
@@ -831,7 +831,7 @@ void add_relNames_to_nmap(jgraph *jg, nM
tmprel = (sql_rel *) tmpnode->data;
if (tmprel->op == op_basetable){
- str s = get_relname_from_basetable(tmprel);
+ const char* s = get_relname_from_basetable(tmprel);
#if PRINT_FOR_DEBUG
printf("[Node %d --> Table] %s\n", i, s);
#endif
@@ -839,7 +839,7 @@ void add_relNames_to_nmap(jgraph *jg, nM
}
else if (tmprel->op == op_select){
- str s;
+ const char* s;
assert(((sql_rel *)tmprel->l)->op == op_basetable);
//Only handle the case
//when selecting from base_table
s = get_relname_from_basetable((sql_rel *)tmprel->l);
@@ -856,11 +856,11 @@ void add_relNames_to_nmap(jgraph *jg, nM
tmpnode = jg->lstnodes[i];
tmprel = (sql_rel *) tmpnode->data;
if (tmprel->op == op_basetable){
- str s = get_relname_from_basetable(tmprel);
+ const char* s = get_relname_from_basetable(tmprel);
printf("Get nodeId for %s from nmap: %d\n", s,
rname_to_nodeId(nm, s));
}
else if (tmprel->op == op_select){
- str s = get_relname_from_basetable((sql_rel
*)tmprel->l);
+ const char* s = get_relname_from_basetable((sql_rel
*)tmprel->l);
printf("Get nodeId for %s from nmap: %d\n", s,
rname_to_nodeId(nm, s));
}
@@ -869,7 +869,7 @@ void add_relNames_to_nmap(jgraph *jg, nM
}
static
-void get_jp(str pred1, str pred2, JP *jp){
+void get_jp(const char *pred1, const char* pred2, JP *jp){
if (strcmp(pred1, "s")==0 && strcmp(pred2, "s")==0){
*jp = JP_S;
@@ -1059,8 +1059,8 @@ void _add_join_edges(jgraph *jg, sql_rel
#endif
}
else{
- str relname1;
- str relname2;
+ const char* relname1;
+ const char* relname2;
int from, to;
JP tmpjp = JP_S;
@@ -1306,7 +1306,7 @@ static
void add_props_and_subj_to_spprops(spProps *spprops, int idx, sp_po po, jgnode
*node){
if (node->prop){
- str tmpalias = NULL;
+ const char* tmpalias = NULL;
sql_rel *tmprel = (sql_rel*) (node->data);
assert(tmprel->op == op_select);
assert(((sql_rel*)tmprel->l)->op == op_basetable);
@@ -1423,7 +1423,7 @@ void get_col_name_from_p (char **col, ch
* */
static
-void modify_exp_col(mvc *c, sql_exp *m_exp, char *_rname, char *_name, char
*_arname, char *_aname, int update_e_convert, int dummy_exps){
+void modify_exp_col(mvc *c, sql_exp *m_exp, char *_rname, char *_name, const
char *_arname, const char *_aname, int update_e_convert, int dummy_exps){
sql_exp *tmpe = NULL;
sql_exp *ne = NULL;
sql_exp *le = NULL; //right expression, should be e_convert
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
