Changeset: be0a9a36c9d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be0a9a36c9d0
Modified Files:
Branch: sciql
Log Message:
merge with default
diffs (truncated from 1369 to 300 lines):
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -494,8 +494,23 @@
GlobalMemoryStatus(&memStat);
_MT_npages = memStat.dwTotalPhys / _MT_pagesize;
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE)
- /* FreeBSD, NetBSD, Darwin */
+#elif defined(HAVE_SYS_SYSCTL_H) && (defined(HW_PHYSMEM64) ||
defined(HW_MEMSIZE) || defined(HW_PHYSMEM))
+# if SIZEOF_SIZE_T == SIZEOF_INT && defined(HW_PHYSMEM)
+ /* FreeBSD, NetBSD, OpenBSD, Darwin, 32-bits */
+ {
+ int size = 0;
+ size_t len = sizeof(size);
+ int mib[2];
+
+ /* Everyone should have permission to make this call,
+ * if we get a failure something is really wrong. */
+ mib[0] = CTL_HW;
+ mib[1] = HW_PHYSMEM;
+ sysctl(mib, 2, &size, &len, NULL, 0);
+ _MT_npages = size / _MT_pagesize;
+ }
+# elif defined(HW_MEMSIZE)
+ /* FreeBSD, NetBSD, Darwin, 64-bits */
{
uint64_t size = 0;
size_t len = sizeof(size);
@@ -506,16 +521,10 @@
mib[0] = CTL_HW;
mib[1] = HW_MEMSIZE;
sysctl(mib, 2, &size, &len, NULL, 0);
-# ifdef SIZEOF_SIZE_T == SIZEOF_INT
- /* we can have more memory than a size_t can handle on a 32-bits
- * platform, so trim it down, if that is the case */
- if (size > 0xffffffff)
- size = 0xffffffff;
-# endif
_MT_npages = size / _MT_pagesize;
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined (HW_PHYSMEM64)
- /* OpenBSD */
+# elif defined (HW_PHYSMEM64)
+ /* OpenBSD, 64-bits */
{
int64_t size = 0;
size_t len = sizeof(size);
@@ -526,14 +535,9 @@
mib[0] = CTL_HW;
mib[1] = HW_PHYSMEM64;
sysctl(mib, 2, &size, &len, NULL, 0);
-# ifdef SIZEOF_SIZE_T == SIZEOF_INT
- /* we can have more memory than a size_t can handle on a 32-bits
- * platform, so trim it down, if that is the case */
- if (size > 0xffffffff)
- size = 0xffffffff;
-# endif
_MT_npages = size / _MT_pagesize;
}
+# endif
#elif defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)
_MT_npages = sysconf(_SC_PHYS_PAGES);
#else
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -30,13 +30,13 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/mutils)
-GDK_VERSION=3:0:0
+GDK_VERSION=3:1:0
# version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=3:0:0
+MAPI_VERSION=3:1:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=7:0:0
+MONETDB5_VERSION=7:1:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=2:0:0
+STREAM_VERSION=2:1:0
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -3466,9 +3466,19 @@
throw(SQL,"sql", "table %s not found", tname);
if (list_length(t->columns.set) != (pci->argc-3))
throw(SQL,"sql", "Not enough columns in found");
+
+ for (i = 3, n = t->columns.set->h; i<pci->argc && n; i++, n = n->next) {
+ sql_column *col = n->data;
+
+ if (ATOMvarsized(col->type.type->localtype ))
+ throw(SQL, "sql", "failed to attach file %s",
+ *(str*)getArgReference(stk, pci, i));
+ }
+
b = BATnew(TYPE_str, TYPE_bat, pci->argc-3);
if( b == NULL)
throw(SQL, "sql.import", MAL_MALLOC_FAIL);
+
for (i = 3, n = t->columns.set->h; i<pci->argc && n; i++, n = n->next) {
sql_column *col = n->data;
BAT *c;
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -638,8 +638,6 @@
{
sql_exp *l = e->l, *r = e->r;
- if (l->card == CARD_ATOM || r->card == CARD_ATOM)
- return 1;
if (exp_is_complex_select(l) || exp_is_complex_select(r))
return 1;
return 0;
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -9,3 +9,5 @@
crash_on_alias.Bug-2798
groupby_primary_key.Bug-2807
merge_range_exp.Bug-2806
+count-count-distinct.Bug-2808
+subquery_in_from_clause.Bug-2812
diff --git
a/sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.sql
b/sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.sql
@@ -0,0 +1,1024 @@
+
+CREATE TABLE SALESMART (
+ --ID BIGINT GENERATED ALWAYS AS IDENTITY NOT NULL PRIMARY KEY,
+ ITEM VARCHAR(100),
+ CATEGORY VARCHAR(100),
+ PRICE NUMERIC(10,2),
+ CITY VARCHAR(100),
+ REGION VARCHAR(100),
+ COUNTRY VARCHAR(100)
+);
+
+COPY 1000 RECORDS INTO SALESMART FROM STDIN USING DELIMITERS ';', '\n', '"';
+L'Oven Fresh white bread;Baked goods;0.59;San Francisco;California;United
States
+Texas cheese toast;Frozen;1.49;Paris;Ile-De-France;France
+Broccoli stir fry mixture;Frozen;0.89;Bluff City;Kansas;United States
+Sausage, brown/serve;Frozen;0.99;Plymouth;Tobago;Trinidad and Tobago
+Peppers, tricolor pack;Produce;1.99;Glendale;Arizona;United States
+Cinnamon Grahams;Snack;0.99;London;Ontario;Canada
+Mushrooms;Produce;0.99;Blountsville;Alabama;United States
+Tissues;Nonfoods;0.89;Aalestrup;Nordjylland;Denmark
+Spoon size shredded wheat;Cereal;1.69;Cairo;Illinois;United States
+Cheese, Colby brick;Dairy;1.49;Crooks;South Dakota;United States
+Wheat crackers (triscuit);Snack;0.99;Stirling;Scotland;United Kingdom
+Eggs, large;Dairy;0.89;Blountsville;Alabama;United States
+Broccoli stir fry mixture;Frozen;0.89;Helsinki;Etela-Suomen Laani;Finland
+Tissues;Nonfoods;0.89;Bluff City;Kansas;United States
+Baking soda;Baking;0.39;West Long Branch;New Jersey;United States
+Saltines;Snack;0.69;Amsterdam;Ohio;United States
+Lettuce, iceberg;Produce;0.89;North Grafton;Massachusetts;United States
+Belmont chocolate chip cookies;Snack;1.49;Victoria Falls;Matabeleland
North;Zimbabwe
+Orange juice, not from concentrate;Dairy;1.99;Crooks;South Dakota;United States
+Milk, 2%;Dairy;2.69;Hechi;Guangxi;China
+Cheese, Feta, blue or gorgonzola tub;Dairy;1.69;Amsterdam;Ohio;United States
+Single serve fruit/gel bowls;Canned;1.39;Cushing;Texas;United States
+Broccoli stir fry mixture;Frozen;0.89;Hamburg;Illinois;United States
+Celery;Produce;0.99;Amsterdam;Ohio;United States
+Butter;Dairy;1.99;Prudence Island;Rhode Island;United States
+Lite drink mix (Crystal Lite);Beverages;1.89;Jerusalem;Yerushalayim
(Jerusalem);Israel
+Orange juice, not from concentrate;Dairy;1.99;Jerusalem;Yerushalayim
(Jerusalem);Israel
+Cucumber (large);Produce;0.49;Roma;Texas;United States
+Vegetarian vegetable condensed soup;Canned;0.43;Bangkok;Krung Thep
Mahanakhon;Thailand
+Sausage, brown/serve;Frozen;0.99;Prudence Island;Rhode Island;United States
+Snack crackers (ritz);Snack;1.29;Franklin Springs;New York;United States
+Sausage, brown/serve;Frozen;0.99;Hawkinsville;Georgia;United States
+Saltines;Snack;0.69;Paris;Ile-De-France;France
+Beef/bean burrito;Frozen;0.29;Scarborough;Tobago;Trinidad and Tobago
+Eggs, large;Dairy;0.89;Holguin;Holguin;Cuba
+Larado paper plates;Nonfoods;0.89;Jerusalem;Yerushalayim (Jerusalem);Israel
+Baking soda;Baking;0.39;Tornillo;Texas;United States
+Larado paper plates;Nonfoods;0.89;Plymouth;Tobago;Trinidad and Tobago
+Spoon size shredded wheat;Cereal;1.69;San Francisco;California;United States
+Tissues;Nonfoods;0.89;Finlayson;Minnesota;United States
+Celery;Produce;0.99;Montpellier;Languedoc-Roussillon;France
+Single serve peach cups;Canned;1.39;Jose Leon Suarez;Buenos Aires;Argentina
+Sausage, brown/serve;Frozen;0.99;Bluff City;Kansas;United States
+Broccoli stir fry mixture;Frozen;0.89;Tornillo;Texas;United States
+Beef/bean burrito;Frozen;0.29;Graysville;Tennessee;United States
+Celery;Produce;0.99;Madrid;Distrito Capital;Colombia
+Deluxe topping pizza;Frozen;1.99;Hamburg;Illinois;United States
+Belmont chocolate chip cookies;Snack;1.49;Santiago del Estero;Santiago del
Estero;Argentina
+Applesauce cups (reg/cinnamon);Canned;0.89;St Andrews;Scotland;United Kingdom
+Cookies, chocolate sandwich (Oreo);Snack;0.99;Thousandsticks;Kentucky;United
States
+Sausage, brown/serve;Frozen;0.99;Plymouth;Tobago;Trinidad and Tobago
+Sausage, brown/serve;Frozen;0.99;Elizabeth;New Jersey;United States
+Wheat crackers (triscuit);Snack;0.99;St Andrews;Scotland;United Kingdom
+Celery;Produce;0.99;Wellington;Wellington;New Zealand
+Vegetarian vegetable condensed soup;Canned;0.43;Seven
Rivers;Westmoreland;Jamaica
+Cheese, Feta, blue or gorgonzola tub;Dairy;1.69;Trondheim;Sor-Trondelag;Norway
+Beef/bean burrito;Frozen;0.29;Douglas City;California;United States
+Single serve fruit/gel bowls;Canned;1.39;Meadowlands;Minnesota;United States
+Broccoli stir fry mixture;Frozen;0.89;Hamburg;Hamburg;Germany
+Snack crackers (ritz);Snack;1.29;Sarajevo;Federation of Bosnia and
Herzegovina;Bosnia and Herzegovina
+Cookies, chocolate sandwich (Oreo);Snack;0.99;Plymouth;Tobago;Trinidad and
Tobago
+Bananas;Produce;0.33;Gafsa;Qafsah;Tunisia
+Peppers, tricolor pack;Produce;1.99;North Grafton;Massachusetts;United States
+Cucumber (large);Produce;0.49;Roxborough;Tobago;Trinidad and Tobago
+Tissues;Nonfoods;0.89;Kyoto;Kyoto;Japan
+Butter;Dairy;1.99;Malone;New York;United States
+Saltines;Snack;0.69;Thousandsticks;Kentucky;United States
+Sausage, brown/serve;Frozen;0.99;Scarborough;Tobago;Trinidad and Tobago
+Texas cheese toast;Frozen;1.49;Helsinki;Etela-Suomen Laani;Finland
+Snack crackers (ritz);Snack;1.29;West Long Branch;New Jersey;United States
+Saltines;Snack;0.69;Amsterdam;Ohio;United States
+Spoon size shredded wheat;Cereal;1.69;Beijing;Beijing;China
+Sweetener packets;Baking;1.49;Jose Leon Suarez;Buenos Aires;Argentina
+Rye bread, seeded;Baked goods;0.99;Chicago;Illinois;United States
+Texas cheese toast;Frozen;1.49;Beijing;Beijing;China
+Bananas;Produce;0.33;Plymouth;Tobago;Trinidad and Tobago
+Waffles;Frozen;0.99;Graysville;Tennessee;United States
+Butter;Dairy;1.99;La Rochelle;Poitou-Charentes;France
+Cheese, Deli style slices, Swiss, Provolone or
Muenster;Dairy;1.69;Sarajevo;Federation of Bosnia and Herzegovina;Bosnia and
Herzegovina
+L'Oven Fresh white bread;Baked goods;0.59;Wallops Island;Virginia;United States
+Lite drink mix (Crystal Lite);Beverages;1.89;Chicago;Illinois;United States
+Beef/bean burrito;Frozen;0.29;New York;New York;United States
+Cucumber (large);Produce;0.49;Cogswell;North Dakota;United States
+Broccoli stir fry mixture;Frozen;0.89;Saratoga;North Carolina;United States
+Applesauce cups (reg/cinnamon);Canned;0.89;West Long Branch;New Jersey;United
States
+Bananas;Produce;0.33;Beaverton;Michigan;United States
+Cheese, Deli style slices, Swiss, Provolone or
Muenster;Dairy;1.69;Beaverton;Michigan;United States
+Orange juice, not from concentrate;Dairy;1.99;Ormond Beach;Florida;United
States
+Vegetarian vegetable condensed soup;Canned;0.43;Sarajevo;Federation of Bosnia
and Herzegovina;Bosnia and Herzegovina
+Baking soda;Baking;0.39;Wellington;Wellington;New Zealand
+Mushrooms;Produce;0.99;Elizabeth;New Jersey;United States
+Baking soda;Baking;0.39;Lone Pine;California;United States
+Sweetener packets;Baking;1.49;Saratoga;North Carolina;United States
+Lite drink mix (Crystal Lite);Beverages;1.89;Cushing;Texas;United States
+Baking soda;Baking;0.39;Amsterdam;Ohio;United States
+L'Oven Fresh white bread;Baked goods;0.59;Roxborough;Tobago;Trinidad and Tobago
+Rye bread, seeded;Baked goods;0.99;Cairo;Illinois;United States
+Deluxe topping pizza;Frozen;1.99;Venlo;Limburg;Netherlands
+Peppers, tricolor pack;Produce;1.99;Seven Rivers;Westmoreland;Jamaica
+Tyson roasted chicken;Meat;3.99;Jose Leon Suarez;Buenos Aires;Argentina
+Single serve fruit/gel bowls;Canned;1.39;Douglas City;California;United States
+Saltines;Snack;0.69;Saratoga;North Carolina;United States
+Cheese, Colby brick;Dairy;1.49;Sliema;Malta;Malta
+Single serve peach cups;Canned;1.39;Seven Rivers;Westmoreland;Jamaica
+Sausage, brown/serve;Frozen;0.99;Cairo;Illinois;United States
+Waffles;Frozen;0.99;Los Angeles;California;United States
+Butter;Dairy;1.99;Davos;Graubunden;Switzerland
+Deluxe topping pizza;Frozen;1.99;Finlayson;Minnesota;United States
+Belmont chocolate chip cookies;Snack;1.49;London;Ontario;Canada
+L'Oven Fresh white bread;Baked
goods;0.59;Montpellier;Languedoc-Roussillon;France
+Sausage, brown/serve;Frozen;0.99;Las Vegas;Nevada;United States
+Sausage, brown/serve;Frozen;0.99;Port Elizabeth;New Jersey;United States
+Peppers, tricolor pack;Produce;1.99;Glendale;Arizona;United States
+Single serve peach cups;Canned;1.39;Crooks;South Dakota;United States
+Butter;Dairy;1.99;Sarajevo;Federation of Bosnia and Herzegovina;Bosnia and
Herzegovina
+Applesauce cups (reg/cinnamon);Canned;0.89;San Francisco;California;United
States
+Applesauce cups (reg/cinnamon);Canned;0.89;Victoria Falls;Matabeleland
North;Zimbabwe
+Vegetarian vegetable condensed soup;Canned;0.43;Seven
Rivers;Westmoreland;Jamaica
+Pudding mix, choc/vanilla;Baking;0.29;Cushing;Texas;United States
+Beef/bean burrito;Frozen;0.29;Elizabeth;New Jersey;United States
+Vegetarian vegetable condensed soup;Canned;0.43;Graysville;Tennessee;United
States
+Beef/bean burrito;Frozen;0.29;Cattaraugus;New York;United States
+Sausage, brown/serve;Frozen;0.99;Cairo;Illinois;United States
+Peppers, green only;Produce;1.39;Kyoto;Kyoto;Japan
+Waffles;Frozen;0.99;Stirling;Scotland;United Kingdom
+Milk, 2%;Dairy;2.69;Wallops Island;Virginia;United States
+Sweetener packets;Baking;1.49;Wallops Island;Virginia;United States
+Texas cheese toast;Frozen;1.49;Shanghai;Shanghai;China
+Peppers, green only;Produce;1.39;Franklin Springs;New York;United States
+Cookies, chocolate sandwich (Oreo);Snack;0.99;West Long Branch;New
Jersey;United States
+Celery;Produce;0.99;Port Elizabeth;New Jersey;United States
+Celery;Produce;0.99;Eau Galle;Wisconsin;United States
+Rye bread, seeded;Baked goods;0.99;North Grafton;Massachusetts;United States
+Cheese, Feta, blue or gorgonzola tub;Dairy;1.69;Las Vegas;Nevada;United States
+Potatoes, Russett;Produce;0.89;Beijing;Beijing;China
+Eggs, large;Dairy;0.89;Beijing;Beijing;China
+Potatoes, Russett;Produce;0.89;Sliema;Malta;Malta
+Single serve peach cups;Canned;1.39;Thelma;Kentucky;United States
+Belmont chocolate chip cookies;Snack;1.49;Franklin Springs;New York;United
States
+Single serve peach cups;Canned;1.39;Montpellier;Languedoc-Roussillon;France
+Belmont chocolate chip cookies;Snack;1.49;Beijing;Beijing;China
+Butter;Dairy;1.99;Barcelona;CataluÒa;Spain
+Lettuce, iceberg;Produce;0.89;Victoria Falls;Matabeleland North;Zimbabwe
+Bananas;Produce;0.33;Eau Galle;Wisconsin;United States
+Pudding mix, choc/vanilla;Baking;0.29;Victoria Falls;Matabeleland
North;Zimbabwe
+Butter;Dairy;1.99;Desmet;Idaho;United States
+Orange juice, not from concentrate;Dairy;1.99;Bluff City;Kansas;United States
+Lite drink mix (Crystal Lite);Beverages;1.89;Fengjie;Sichuan;China
+Sweetener packets;Baking;1.49;North Grafton;Massachusetts;United States
+Single serve fruit/gel bowls;Canned;1.39;Sofia;Sofiya;Bulgaria
+Milk, 2%;Dairy;2.69;London;Ontario;Canada
+Cucumber (large);Produce;0.49;Elizabeth;New Jersey;United States
+Vegetarian vegetable condensed soup;Canned;0.43;St Andrews;Scotland;United
Kingdom
+Eggs, large;Dairy;0.89;Malone;New York;United States
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
