Changeset: a26e4053b6d3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a26e4053b6d3
Modified Files:
gdk/gdk_strimps.c
Branch: Jun2023
Log Message:
Merge heads
diffs (truncated from 811 to 300 lines):
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -20,7 +20,6 @@ set(gdk_public_headers
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gdk_utils.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gdk_cand.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gdk_calc.h>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gdk_strimps.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gdk_time.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_system.h>
@@ -33,7 +32,6 @@ set(gdk_public_headers
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_utils.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_calc.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_cand.h>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_strimps.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_time.h>)
add_library(bat SHARED)
@@ -91,7 +89,7 @@ target_sources(bat
gdk_analytic_func.c
gdk_analytic.h
gdk_tracer.c gdk_tracer.h
- gdk_strimps.c
+ gdk_strimps.c gdk_strimps.h
PUBLIC
${gdk_public_headers})
diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -785,7 +785,7 @@ BATsetstrimps(BAT *b)
}
if (pb->batCount < STRIMP_CREATION_THRESHOLD) {
- GDKerror("Cannot create strimps index on columns with fewer
than %ud elements\n", STRIMP_CREATION_THRESHOLD);
+ GDKerror("Cannot create strimps index on columns with fewer
than " BUNFMT " elements\n", STRIMP_CREATION_THRESHOLD);
if (pb != b)
BBPunfix(pb->batCacheid);
return GDK_FAIL;
diff --git a/gdk/gdk_strimps.h b/gdk/gdk_strimps.h
--- a/gdk/gdk_strimps.h
+++ b/gdk/gdk_strimps.h
@@ -15,10 +15,11 @@
#define STRIMP_VERSION (uint64_t)2
-#define STRIMP_HISTSIZE 256*256
+#define STRIMP_HISTSIZE (256*256)
#define STRIMP_HEADER_SIZE 64
#define STRIMP_PAIRS (STRIMP_HEADER_SIZE - 1)
-#define STRIMP_CREATION_THRESHOLD 5000
+#define STRIMP_CREATION_THRESHOLD \
+ ((BUN) ((ATOMIC_GET(&GDKdebug) & FORCEMITOMASK)? 100 : 5000))
typedef struct {
uint8_t *pbytes;
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -31,8 +31,6 @@
#include <wchar.h>
#include <wctype.h>
-#include "gdk_strimps.h"
-
#ifdef HAVE_LIBPCRE
#include <pcre.h>
#ifndef PCRE_STUDY_JIT_COMPILE
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -710,7 +710,7 @@ SQLCODE SQLERROR UNDER WHENEVER
%token<sval> PUBLIC REFERENCES SCHEMA SET AUTO_COMMIT
%token RETURN
-%token ALTER ADD TABLE COLUMN TO UNIQUE VALUES VIEW WHERE WITH
+%token ALTER ADD TABLE COLUMN TO UNIQUE VALUES VIEW WHERE WITH WITHOUT
%token<sval> sqlDATE TIME TIMESTAMP INTERVAL
%token CENTURY DECADE YEAR QUARTER DOW DOY MONTH WEEK DAY HOUR MINUTE SECOND
EPOCH ZONE
%token LIMIT OFFSET SAMPLE SEED
@@ -4565,6 +4565,7 @@ opt_sign:
tz:
WITH TIME ZONE { $$ = 1; }
+ | WITHOUT TIME ZONE { $$ = 0; } /* the default */
| /* empty */ { $$ = 0; }
;
@@ -5551,6 +5552,7 @@ non_reserved_word:
| TIMESTAMP { $$ = sa_strdup(SA, "timestamp"); } /* sloppy: officially
reserved */
| UESCAPE { $$ = sa_strdup(SA, "uescape"); } /* sloppy: officially
reserved */
| VALUE { $$ = sa_strdup(SA, "value"); } /* sloppy:
officially reserved */
+| WITHOUT { $$ = sa_strdup(SA, "without"); } /* sloppy: officially
reserved */
| ACTION { $$ = sa_strdup(SA, "action"); }
| ANALYZE { $$ = sa_strdup(SA, "analyze"); }
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -317,6 +317,7 @@ scanner_init_keywords(void)
failed += keywords_insert("VIEW", VIEW);
failed += keywords_insert("WHERE", WHERE);
failed += keywords_insert("WITH", WITH);
+ failed += keywords_insert("WITHOUT", WITHOUT);
failed += keywords_insert("DATA", DATA);
failed += keywords_insert("DATE", sqlDATE);
diff --git a/sql/test/strimps/Tests/All b/sql/test/strimps/Tests/All
--- a/sql/test/strimps/Tests/All
+++ b/sql/test/strimps/Tests/All
@@ -1,3 +1,4 @@
strimps_stable_counts
+strimps_stable_counts2
persisted_strimp
strimps_not_like
diff --git a/sql/test/strimps/Tests/strimps_stable_counts2.test
b/sql/test/strimps/Tests/strimps_stable_counts2.test
new file mode 100644
--- /dev/null
+++ b/sql/test/strimps/Tests/strimps_stable_counts2.test
@@ -0,0 +1,673 @@
+statement ok
+CREATE TABLE fal(x STRING)
+
+statement ok
+CREATE TABLE f(y STRING)
+
+statement ok
+COPY 100 RECORDS INTO fal FROM STDIN
+<COPY_INTO_DATA>
+Mary Garcia
+James Ballard
+Alexandria Harris
+Dakota Howell
+Tracy Glover
+Mark Cook
+James Woodard
+Sophia Stone
+Jeffrey Ramirez
+Ryan Knight
+Taylor Lane
+Christopher Russell
+Daniel Sims
+Tony Watts
+Dwayne Johnson
+Jason Dunlap
+Abigail Burton
+Maria Lewis
+Ashley Taylor
+Emma Abbott
+James Whitney
+Philip Maldonado
+Rachel Taylor
+Tina Singleton
+Ricky Johnson
+Anthony Peterson
+Eugene Mata
+Tyler Terry
+Thomas Morales
+Kathy Moore
+William Franco
+Christopher Williams
+David Carter
+Andrew Alvarado
+John Jenkins
+Anthony Charles
+Jose Tran
+Amy Stafford
+Vincent Malone
+Ashley Waters
+Cindy Huffman
+Anthony Hernandez
+Brett Hardy
+Lisa Matthews
+Jeffrey Ingram
+Jessica Miller
+Karen Jones
+Terry Sanders
+Aaron Rodriguez
+Kyle Ortega
+David Clark
+Brent Garrett
+Scott Young
+Shannon Edwards
+Tiffany Macias
+Ricky Gonzalez
+Devin Logan
+Russell Walker
+Michael Nguyen
+Heather Robinson
+April Lawrence
+Christopher Williams
+Laura Gonzalez
+Patrick Ortiz
+Sylvia Phillips
+Cynthia Kemp
+Stephanie Gillespie
+Elizabeth Joseph
+Jay Collins
+Johnny Gibson
+Dr. Audrey Sellers MD
+Desiree Li
+Heather Brown
+Shelly Bauer
+Donna Anderson
+Amy Sharp
+Olivia Howell
+Margaret Tran
+Alexandra Jarvis
+Glen Ray
+Michael Mendoza
+Sarah Hall
+Dennis Moss
+Wanda Brooks
+Debra Powers
+Shannon Nguyen
+Daisy Mcdonald
+Donna Rivera
+Samuel Jackson
+Wendy Howe
+Connor Howell
+Jeffrey Newman
+Daniel Sullivan
+Megan Dunn
+Laura Holland
+Brendan Bates
+Mary Miller
+Thomas Ramirez
+Leah Holland
+Megan Warren
+
+statement ok
+COPY 100 RECORDS INTO f FROM STDIN
+<COPY_INTO_DATA>
+Noah
+Ronald
+Mary
+Jennifer
+Tanya
+Ivan
+Randy
+Erin
+Ryan
+Scott
+Kathryn
+Brandi
+Rebecca
+Katie
+Diane
+Stephen
+Michael
+Jeremiah
+Timothy
+James
+Mark
+Thomas
+Leslie
+Robert
+Joel
+James
+Anna
+Alan
+Janet
+Samuel
+Tanya
+Russell
+Alexis
+Scott
+Jenna
+Eric
+Andrew
+Sandra
+Stephanie
+Jeremy
+Don
+Lisa
+Jacqueline
+Melissa
+Patricia
+Ana
+Danielle
+Cheryl
+Justin
+Karen
+Pamela
+Beverly
+Becky
+Caitlin
+Michael
+Emma
+Darlene
+Darrell
+David
+Wanda
+Sydney
+Susan
+Louis
+Brittany
+William
+Daniel
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
