Fix bug in handling duplicate values in vops_populate

knizhnik · knizhnik · commit e91c75d82102 · 2018-03-19T11:57:46.000+03:00
diff --git a/vops.c b/vops.c
@@ -1514,7 +1514,7 @@ Datum vops_populate(PG_FUNCTION_ARGS)
 						for (i = 0; i < n_attrs; i++) {
 							if (types[i].tid != VOPS_LAST) {
 								vops_tile_hdr* tile = DatumGetVops(values[i]);
-								tile->empty_mask |= (uint64)~0 << j;
+								tile->empty_mask = (uint64)~0 << j;
 							}
 						}
 						insert_tuple(values, nulls);
@@ -1569,7 +1569,7 @@ Datum vops_populate(PG_FUNCTION_ARGS)
 			for (i = 0; i < n_attrs; i++) {
 				if (types[i].tid != VOPS_LAST) {
 					vops_tile_hdr* tile = DatumGetVops(values[i]);
-					tile->empty_mask |= (uint64)~0 << j;
+					tile->empty_mask = (uint64)~0 << j;
 				}
 			}
 		}
@@ -1673,6 +1673,12 @@ Datum vops_import(PG_FUNCTION_ARGS)
 	for (j = 0, loaded = 0; fgets(buf, sizeof buf, in) != NULL; loaded++, vops_import_lineno++, j++) {
 		char* p = buf;
 		if (j == TILE_SIZE) {
+			for (k = 0; k < n_attrs; k++) {
+				if (types[k].tid != VOPS_LAST) {
+					vops_tile_hdr* tile = DatumGetVops(values[k]);
+					tile->empty_mask = 0;
+				}
+			}
 			insert_tuple(values, nulls);
 			j = 0;
 		}
@@ -1734,7 +1740,7 @@ Datum vops_import(PG_FUNCTION_ARGS)
 					for (k = 0; k < n_attrs; k++) {
 						if (types[k].tid != VOPS_LAST) {
 							vops_tile_hdr* tile = DatumGetVops(values[k]);
-							tile->empty_mask |= (uint64)~0 << j;
+							tile->empty_mask = (uint64)~0 << j;
 						}
 					}
 					insert_tuple(values, nulls);
@@ -1816,7 +1822,7 @@ Datum vops_import(PG_FUNCTION_ARGS)
 			for (i = 0; i < n_attrs; i++) {
 				if (types[i].tid != VOPS_LAST) {
 					vops_tile_hdr* tile = DatumGetVops(values[i]);
-					tile->empty_mask |= (uint64)~0 << j;
+					tile->empty_mask = (uint64)~0 << j;
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1514,7 +1514,7 @@ Datum vops_populate(PG_FUNCTION_ARGS)`
`1514`	`1514`	`for (i = 0; i < n_attrs; i++) {`
`1515`	`1515`	`if (types[i].tid != VOPS_LAST) {`
`1516`	`1516`	`vops_tile_hdr* tile = DatumGetVops(values[i]);`
`1517`		`- tile->empty_mask \|= (uint64)~0 << j;`
	`1517`	`+ tile->empty_mask = (uint64)~0 << j;`
`1518`	`1518`	`}`
`1519`	`1519`	`}`
`1520`	`1520`	`insert_tuple(values, nulls);`
`@@ -1569,7 +1569,7 @@ Datum vops_populate(PG_FUNCTION_ARGS)`
`1569`	`1569`	`for (i = 0; i < n_attrs; i++) {`
`1570`	`1570`	`if (types[i].tid != VOPS_LAST) {`
`1571`	`1571`	`vops_tile_hdr* tile = DatumGetVops(values[i]);`
`1572`		`- tile->empty_mask \|= (uint64)~0 << j;`
	`1572`	`+ tile->empty_mask = (uint64)~0 << j;`
`1573`	`1573`	`}`
`1574`	`1574`	`}`
`1575`	`1575`	`}`
`@@ -1673,6 +1673,12 @@ Datum vops_import(PG_FUNCTION_ARGS)`
`1673`	`1673`	`for (j = 0, loaded = 0; fgets(buf, sizeof buf, in) != NULL; loaded++, vops_import_lineno++, j++) {`
`1674`	`1674`	`char* p = buf;`
`1675`	`1675`	`if (j == TILE_SIZE) {`
	`1676`	`+ for (k = 0; k < n_attrs; k++) {`
	`1677`	`+ if (types[k].tid != VOPS_LAST) {`
	`1678`	`+ vops_tile_hdr* tile = DatumGetVops(values[k]);`
	`1679`	`+ tile->empty_mask = 0;`
	`1680`	`+ }`
	`1681`	`+ }`
`1676`	`1682`	`insert_tuple(values, nulls);`
`1677`	`1683`	`j = 0;`
`1678`	`1684`	`}`
`@@ -1734,7 +1740,7 @@ Datum vops_import(PG_FUNCTION_ARGS)`
`1734`	`1740`	`for (k = 0; k < n_attrs; k++) {`
`1735`	`1741`	`if (types[k].tid != VOPS_LAST) {`
`1736`	`1742`	`vops_tile_hdr* tile = DatumGetVops(values[k]);`
`1737`		`- tile->empty_mask \|= (uint64)~0 << j;`
	`1743`	`+ tile->empty_mask = (uint64)~0 << j;`
`1738`	`1744`	`}`
`1739`	`1745`	`}`
`1740`	`1746`	`insert_tuple(values, nulls);`
`@@ -1816,7 +1822,7 @@ Datum vops_import(PG_FUNCTION_ARGS)`
`1816`	`1822`	`for (i = 0; i < n_attrs; i++) {`
`1817`	`1823`	`if (types[i].tid != VOPS_LAST) {`
`1818`	`1824`	`vops_tile_hdr* tile = DatumGetVops(values[i]);`
`1819`		`- tile->empty_mask \|= (uint64)~0 << j;`
	`1825`	`+ tile->empty_mask = (uint64)~0 << j;`
`1820`	`1826`	`}`
`1821`	`1827`	`}`
`1822`	`1828`	`}`