X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fpsql-reader.c;h=a38c9e90301646a3329a0ef9f804fc9f3752a29f;hb=0eded6940b00e6523d7a0a7f76e40c70324f85d2;hp=9df82b558c69252930fdf932e0ed5575edd3cfa8;hpb=18e5609ea65b59f38fcd681f8555775f2e5b7ccd;p=pspp diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c index 9df82b558c..a38c9e9030 100644 --- a/src/data/psql-reader.c +++ b/src/data/psql-reader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,19 +16,25 @@ #include -#include -#include -#include -#include +#include "data/psql-reader.h" + +#include +#include #include -#include "psql-reader.h" -#include "variable.h" -#include "format.h" -#include "calendar.h" +#include "data/calendar.h" +#include "data/casereader-provider.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/variable.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" -#include -#include +#include "gl/c-strcase.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -37,7 +43,7 @@ #if !PSQL_SUPPORT struct casereader * -psql_open_reader (struct psql_read_info *info, struct dictionary **dict) +psql_open_reader (struct psql_read_info *info UNUSED, struct dictionary **dict UNUSED) { msg (ME, _("Support for reading postgres databases was not compiled into this installation of PSPP")); @@ -50,6 +56,9 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) #include +/* Default width of string variables. */ +#define PSQL_DEFAULT_WIDTH 8 + /* These macros must be the same as in catalog/pg_types.h from the postgres source */ #define BOOLOID 16 #define BYTEAOID 17 @@ -75,8 +84,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) static void psql_casereader_destroy (struct casereader *reader UNUSED, void *r_); -static bool psql_casereader_read (struct casereader *, void *, - struct ccase *); +static struct ccase *psql_casereader_read (struct casereader *, void *); static const struct casereader_class psql_casereader_class = { @@ -96,7 +104,7 @@ struct psql_reader double postgres_epoch; - size_t value_cnt; + struct caseproto *proto; struct dictionary *dict; /* An array of ints, which maps psql column numbers into @@ -109,8 +117,7 @@ struct psql_reader }; -static bool set_value (struct psql_reader *r, - struct ccase *cc); +static struct ccase *set_value (struct psql_reader *r); @@ -121,7 +128,7 @@ data_to_native (const void *in_, void *out_, int len) int i; const unsigned char *in = in_; unsigned char *out = out_; - for (i = 0 ; i < len ; ++i ) + for (i = 0 ; i < len ; ++i) out[i] = in[i]; } #else @@ -131,7 +138,7 @@ data_to_native (const void *in_, void *out_, int len) int i; const unsigned char *in = in_; unsigned char *out = out_; - for (i = 0 ; i < len ; ++i ) + for (i = 0 ; i < len ; ++i) out[len - i - 1] = in[i]; } #endif @@ -159,7 +166,7 @@ dump (const unsigned char *x, int l) for (i = 0; i < l ; ++i) { - if ( isprint (x[i])) + if (isprint (x[i])) printf ("%c ", x[i]); else printf (" "); @@ -175,20 +182,15 @@ create_var (struct psql_reader *r, const struct fmt_spec *fmt, { unsigned long int vx = 0; struct variable *var; - char name[VAR_NAME_LEN + 1]; - - r->value_cnt += value_cnt_from_width (width); - - if ( ! dict_make_unique_var_name (r->dict, suggested_name, &vx, name)) - { - msg (ME, _("Cannot create variable name from %s"), suggested_name); - return NULL; - } + char *name; + name = dict_make_unique_var_name (r->dict, suggested_name, &vx); var = dict_create_var (r->dict, name, width); + free (name); + var_set_both_formats (var, fmt); - if ( col != -1) + if (col != -1) { r->vmap = xrealloc (r->vmap, (col + 1) * sizeof (*r->vmap)); @@ -229,18 +231,19 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) int n_fields, n_tuples; PGresult *qres = NULL; casenumber n_cases = CASENUMBER_MAX; + const char *encoding; - struct psql_reader *r = xzalloc (sizeof *r); + struct psql_reader *r = XZALLOC (struct psql_reader); struct string query ; r->conn = PQconnectdb (info->conninfo); - if ( NULL == r->conn) + if (NULL == r->conn) { msg (ME, _("Memory error whilst opening psql source")); goto error; } - if ( PQstatus (r->conn) != CONNECTION_OK ) + if (PQstatus (r->conn) != CONNECTION_OK) { msg (ME, _("Error opening psql source: %s."), PQerrorMessage (r->conn)); @@ -249,12 +252,12 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) } { - int ver_num; + int ver_num = 0; const char *vers = PQparameterStatus (r->conn, "server_version"); sscanf (vers, "%d", &ver_num); - if ( ver_num < 8) + if (ver_num < 8) { msg (ME, _("Postgres server is version %s." @@ -268,11 +271,11 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) { const char *dt = PQparameterStatus (r->conn, "integer_datetimes"); - r->integer_datetimes = ( 0 == strcasecmp (dt, "on")); + r->integer_datetimes = (0 == c_strcasecmp (dt, "on")); } #if USE_SSL - if ( PQgetssl (r->conn) == NULL) + if (PQgetssl (r->conn) == NULL) #endif { if (! info->allow_clear) @@ -283,26 +286,41 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) } } - r->postgres_epoch = - calendar_gregorian_to_offset (2000, 1, 1, NULL, NULL); - + r->postgres_epoch = calendar_gregorian_to_offset ( + 2000, 1, 1, settings_get_fmt_settings (), NULL); - /* Create the dictionary and populate it */ - *dict = r->dict = dict_create (); + { + const int enc = PQclientEncoding (r->conn); + + /* According to section 22.2 of the Postgresql manual + a value of zero (SQL_ASCII) indicates + "a declaration of ignorance about the encoding". + Accordingly, we use the default encoding + if we find this value. + */ + encoding = enc ? pg_encoding_to_char (enc) : get_default_encoding (); + + /* Create the dictionary and populate it */ + *dict = r->dict = dict_create (encoding); + } + const int version = PQserverVersion (r->conn); + ds_init_empty (&query); /* - select count (*) from (select * from medium) stupid_sql_standard; - */ - - ds_init_cstr (&query, - "BEGIN READ ONLY ISOLATION LEVEL SERIALIZABLE; " - "DECLARE pspp BINARY CURSOR FOR "); + Versions before 9.1 don't have the REPEATABLE READ isolation level. + However according to if the server is in the + "hot standby" mode then SERIALIZABLE won't work. + */ + ds_put_c_format (&query, + "BEGIN READ ONLY ISOLATION LEVEL %s; " + "DECLARE pspp BINARY CURSOR FOR ", + (version < 90100) ? "SERIALIZABLE" : "REPEATABLE READ"); ds_put_substring (&query, info->sql.ss); qres = PQexec (r->conn, ds_cstr (&query)); ds_destroy (&query); - if ( PQresultStatus (qres) != PGRES_COMMAND_OK ) + if (PQresultStatus (qres) != PGRES_COMMAND_OK) { msg (ME, _("Error from psql source: %s."), PQresultErrorMessage (qres)); @@ -327,7 +345,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) qres = PQexec (r->conn, ds_cstr (&query)); ds_destroy (&query); - if ( PQresultStatus (qres) != PGRES_TUPLES_OK ) + if (PQresultStatus (qres) != PGRES_TUPLES_OK) { msg (ME, _("Error from psql source: %s."), PQresultErrorMessage (qres)); @@ -337,7 +355,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) PQclear (qres); qres = PQexec (r->conn, "FETCH FIRST FROM pspp"); - if ( PQresultStatus (qres) != PGRES_TUPLES_OK ) + if (PQresultStatus (qres) != PGRES_TUPLES_OK) { msg (ME, _("Error from psql source: %s."), PQresultErrorMessage (qres)); @@ -347,24 +365,24 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) n_tuples = PQntuples (qres); n_fields = PQnfields (qres); - r->value_cnt = 0; + r->proto = NULL; r->vmap = NULL; r->vmapsize = 0; - for (i = 0 ; i < n_fields ; ++i ) + for (i = 0 ; i < n_fields ; ++i) { struct variable *var; - struct fmt_spec fmt = {FMT_F, 8, 2}; + struct fmt_spec fmt = { .type = FMT_F, .w = 8, .d = 2 }; Oid type = PQftype (qres, i); int width = 0; int length ; - /* If there are no data then make a finger in the air + /* If there are no data then make a finger in the air guess at the contents */ - if ( n_tuples > 0 ) + if (n_tuples > 0) length = PQgetlength (qres, 0, i); - else - length = MAX_SHORT_STRING; + else + length = PSQL_DEFAULT_WIDTH; switch (type) { @@ -391,13 +409,13 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) case BPCHAROID: fmt.type = FMT_A; width = (info->str_width == -1) ? - ROUND_UP (length, MAX_SHORT_STRING) : info->str_width; + ROUND_UP (length, PSQL_DEFAULT_WIDTH) : info->str_width; fmt.w = width; fmt.d = 0; break; case BYTEAOID: fmt.type = FMT_AHEX; - width = length > 0 ? length : MAX_SHORT_STRING; + width = length > 0 ? length : PSQL_DEFAULT_WIDTH; fmt.w = width * 2; fmt.d = 0; break; @@ -436,18 +454,18 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) default: msg (MW, _("Unsupported OID %d. SYSMIS values will be inserted."), type); fmt.type = FMT_A; - width = length > 0 ? length : MAX_SHORT_STRING; + width = length > 0 ? length : PSQL_DEFAULT_WIDTH; fmt.w = width ; fmt.d = 0; break; } - if ( width == 0 && fmt_is_string (fmt.type)) - fmt.w = width = MAX_SHORT_STRING; + if (width == 0 && fmt_is_string (fmt.type)) + fmt.w = width = PSQL_DEFAULT_WIDTH; var = create_var (r, &fmt, width, PQfname (qres, i), i); - if ( type == NUMERICOID && n_tuples > 0) + if (type == NUMERICOID && n_tuples > 0) { const uint8_t *vptr = (const uint8_t *) PQgetvalue (qres, 0, i); struct fmt_spec fmt; @@ -505,7 +523,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) PQclear (qres); qres = PQexec (r->conn, "MOVE BACKWARD 1 FROM pspp"); - if ( PQresultStatus (qres) != PGRES_COMMAND_OK) + if (PQresultStatus (qres) != PGRES_COMMAND_OK) { PQclear (qres); goto error; @@ -518,15 +536,16 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict) ds_put_format (&r->fetch_cmd, "FETCH FORWARD %d FROM pspp", r->cache_size); reload_cache (r); + r->proto = caseproto_ref (dict_get_proto (*dict)); return casereader_create_sequential (NULL, - r->value_cnt, + r->proto, n_cases, &psql_casereader_class, r); error: - dict_destroy (*dict); + dict_unref (*dict); psql_casereader_destroy (NULL, r); return NULL; @@ -544,46 +563,46 @@ psql_casereader_destroy (struct casereader *reader UNUSED, void *r_) free (r->vmap); if (r->res) PQclear (r->res); PQfinish (r->conn); + caseproto_unref (r->proto); free (r); } -static bool -psql_casereader_read (struct casereader *reader UNUSED, void *r_, - struct ccase *cc) +static struct ccase * +psql_casereader_read (struct casereader *reader UNUSED, void *r_) { struct psql_reader *r = r_; - if ( NULL == r->res || r->tuple >= r->cache_size) + if (NULL == r->res || r->tuple >= r->cache_size) { - if ( ! reload_cache (r) ) + if (! reload_cache (r)) return false; } - return set_value (r, cc); + return set_value (r); } -static bool -set_value (struct psql_reader *r, - struct ccase *c) +static struct ccase * +set_value (struct psql_reader *r) { - int i; + struct ccase *c; int n_vars; + int i; assert (r->res); n_vars = PQnfields (r->res); - if ( r->tuple >= PQntuples (r->res)) - return false; + if (r->tuple >= PQntuples (r->res)) + return NULL; - case_create (c, r->value_cnt); - memset (case_data_rw_idx (c, 0)->s, ' ', MAX_SHORT_STRING * r->value_cnt); + c = case_create (r->proto); + case_set_missing (c); - for (i = 0 ; i < n_vars ; ++i ) + for (i = 0 ; i < n_vars ; ++i) { Oid type = PQftype (r->res, i); const struct variable *v = r->vmap[i]; @@ -710,7 +729,7 @@ set_value (struct psql_reader *r, case INTERVALOID: { - if ( r->integer_datetimes ) + if (r->integer_datetimes) { uint32_t months; uint32_t days; @@ -756,7 +775,7 @@ set_value (struct psql_reader *r, case TIMEOID: { - if ( r->integer_datetimes) + if (r->integer_datetimes) { uint64_t x; GET_VALUE (&vptr, x); @@ -774,7 +793,7 @@ set_value (struct psql_reader *r, case TIMETZOID: { int32_t zone; - if ( r->integer_datetimes) + if (r->integer_datetimes) { uint64_t x; @@ -798,7 +817,7 @@ set_value (struct psql_reader *r, case TIMESTAMPOID: case TIMESTAMPTZOID: { - if ( r->integer_datetimes) + if (r->integer_datetimes) { int64_t x; @@ -806,7 +825,7 @@ set_value (struct psql_reader *r, x /= 1000000; - val->f = (x + r->postgres_epoch * 24 * 3600 ); + val->f = (x + r->postgres_epoch * 24 * 3600); } else { @@ -814,7 +833,7 @@ set_value (struct psql_reader *r, GET_VALUE (&vptr, x); - val->f = (x + r->postgres_epoch * 24 * 3600 ); + val->f = (x + r->postgres_epoch * 24 * 3600); } } break; @@ -822,7 +841,7 @@ set_value (struct psql_reader *r, case VARCHAROID: case BPCHAROID: case BYTEAOID: - memcpy (val->s, (char *) vptr, MIN (length, var_width)); + memcpy (val->s, vptr, MIN (length, var_width)); break; case NUMERICOID: @@ -855,10 +874,10 @@ set_value (struct psql_reader *r, f += x * pow (10000, weight--); } - if ( sign == 0x4000) + if (sign == 0x4000) f *= -1.0; - if ( sign == 0xC000) + if (sign == 0xC000) val->f = SYSMIS; else val->f = f; @@ -874,7 +893,7 @@ set_value (struct psql_reader *r, r->tuple++; - return true; + return c; } #endif