← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.cc

  • Committer: Monty Taylor
  • Date: 2009-02-08 11:28:58 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mordred@inaugust.com-20090208112858-aouo9w2okht5r6x0
ZOMG. Renamed all the rest of the stuff in libdrizzleclient to be drizzleclient_*. I love commandline perl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleslap.cc
717
717
static void print_version(void)
718
718
{
719
719
  printf("%s  Ver %s Distrib %s, for %s (%s)\n",my_progname, SLAP_VERSION,
720
 
         drizzle_get_client_info(),SYSTEM_TYPE,MACHINE_TYPE);
 
720
         drizzleclient_get_client_info(),SYSTEM_TYPE,MACHINE_TYPE);
721
721
}
722
722
 
723
723
 
1763
1763
 
1764
1764
  if (verbose >= 3)
1765
1765
    printf("%.*s;\n", len, query);
1766
 
  return drizzle_real_query(drizzle, query, len);
 
1766
  return drizzleclient_real_query(drizzle, query, len);
1767
1767
}
1768
1768
 
1769
1769
 
1805
1805
    if (run_query(drizzle, "SELECT id from t1", strlen("SELECT id from t1")))
1806
1806
    {
1807
1807
      fprintf(stderr,"%s: Cannot select GUID primary keys. (%s)\n", my_progname,
1808
 
              drizzle_error(drizzle));
 
1808
              drizzleclient_error(drizzle));
1809
1809
      exit(1);
1810
1810
    }
1811
1811
 
1812
 
    result= drizzle_store_result(drizzle);
1813
 
    uint64_t num_rows_ret= drizzle_num_rows(result);
 
1812
    result= drizzleclient_store_result(drizzle);
 
1813
    uint64_t num_rows_ret= drizzleclient_num_rows(result);
1814
1814
    if (num_rows_ret > SIZE_MAX)
1815
1815
    {
1816
1816
      fprintf(stderr, "More primary keys than than architecture supports\n");
1832
1832
        exit(1);
1833
1833
      }
1834
1834
      memset(primary_keys, 0, (size_t)(sizeof(char *) * primary_keys_number_of));
1835
 
      row= drizzle_fetch_row(result);
 
1835
      row= drizzleclient_fetch_row(result);
1836
1836
      for (counter= 0; counter < primary_keys_number_of;
1837
 
           counter++, row= drizzle_fetch_row(result))
 
1837
           counter++, row= drizzleclient_fetch_row(result))
1838
1838
      {
1839
1839
        primary_keys[counter]= strdup(row[0]);
1840
1840
        if (primary_keys[counter] == NULL)
1845
1845
      }
1846
1846
    }
1847
1847
 
1848
 
    drizzle_free_result(result);
 
1848
    drizzleclient_free_result(result);
1849
1849
  }
1850
1850
 
1851
1851
  return(0);
1889
1889
  if (run_query(drizzle, query, len))
1890
1890
  {
1891
1891
    fprintf(stderr,"%s: Cannot create schema %s : %s\n", my_progname, db,
1892
 
            drizzle_error(drizzle));
 
1892
            drizzleclient_error(drizzle));
1893
1893
    exit(1);
1894
1894
  }
1895
1895
  else
1906
1906
    if (verbose >= 3)
1907
1907
      printf("%s;\n", query);
1908
1908
 
1909
 
    if (drizzle_select_db(drizzle,  db))
 
1909
    if (drizzleclient_select_db(drizzle,  db))
1910
1910
    {
1911
1911
      fprintf(stderr,"%s: Cannot select schema '%s': %s\n",my_progname, db,
1912
 
              drizzle_error(drizzle));
 
1912
              drizzleclient_error(drizzle));
1913
1913
      exit(1);
1914
1914
    }
1915
1915
    sptr->create_count++;
1922
1922
    if (run_query(drizzle, query, len))
1923
1923
    {
1924
1924
      fprintf(stderr,"%s: Cannot set default engine: %s\n", my_progname,
1925
 
              drizzle_error(drizzle));
 
1925
              drizzleclient_error(drizzle));
1926
1926
      exit(1);
1927
1927
    }
1928
1928
    sptr->create_count++;
1946
1946
      if (run_query(drizzle, buffer, strlen(buffer)))
1947
1947
      {
1948
1948
        fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n",
1949
 
                my_progname, (uint)ptr->length, ptr->string, drizzle_error(drizzle));
 
1949
                my_progname, (uint)ptr->length, ptr->string, drizzleclient_error(drizzle));
1950
1950
        if (!opt_ignore_sql_errors)
1951
1951
          exit(1);
1952
1952
      }
1957
1957
      if (run_query(drizzle, ptr->string, ptr->length))
1958
1958
      {
1959
1959
        fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n",
1960
 
                my_progname, (uint)ptr->length, ptr->string, drizzle_error(drizzle));
 
1960
                my_progname, (uint)ptr->length, ptr->string, drizzleclient_error(drizzle));
1961
1961
        if (!opt_ignore_sql_errors)
1962
1962
          exit(1);
1963
1963
      }
1990
1990
  if (run_query(drizzle, query, len))
1991
1991
  {
1992
1992
    fprintf(stderr,"%s: Cannot drop database '%s' ERROR : %s\n",
1993
 
            my_progname, db, drizzle_error(drizzle));
 
1993
            my_progname, db, drizzleclient_error(drizzle));
1994
1994
    exit(1);
1995
1995
  }
1996
1996
 
2011
2011
    if (run_query(drizzle, ptr->string, ptr->length))
2012
2012
    {
2013
2013
      fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n",
2014
 
              my_progname, (uint)ptr->length, ptr->string, drizzle_error(drizzle));
 
2014
              my_progname, (uint)ptr->length, ptr->string, drizzleclient_error(drizzle));
2015
2015
      exit(1);
2016
2016
    }
2017
2017
    if (!opt_only_print)
2018
2018
    {
2019
 
      if (drizzle_field_count(drizzle))
 
2019
      if (drizzleclient_field_count(drizzle))
2020
2020
      {
2021
 
        result= drizzle_store_result(drizzle);
2022
 
        drizzle_free_result(result);
 
2021
        result= drizzleclient_store_result(drizzle);
 
2022
        drizzleclient_free_result(result);
2023
2023
      }
2024
2024
    }
2025
2025
  }
2244
2244
        if (run_query(&drizzle, buffer, length))
2245
2245
        {
2246
2246
          fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n",
2247
 
                  my_progname, (uint)length, buffer, drizzle_error(&drizzle));
 
2247
                  my_progname, (uint)length, buffer, drizzleclient_error(&drizzle));
2248
2248
          exit(1);
2249
2249
        }
2250
2250
      }
2254
2254
      if (run_query(&drizzle, ptr->string, ptr->length))
2255
2255
      {
2256
2256
        fprintf(stderr,"%s: Cannot run query %.*s ERROR : %s\n",
2257
 
                my_progname, (uint)ptr->length, ptr->string, drizzle_error(&drizzle));
 
2257
                my_progname, (uint)ptr->length, ptr->string, drizzleclient_error(&drizzle));
2258
2258
        exit(1);
2259
2259
      }
2260
2260
    }
2263
2263
    {
2264
2264
      do
2265
2265
      {
2266
 
        if (drizzle_field_count(&drizzle))
 
2266
        if (drizzleclient_field_count(&drizzle))
2267
2267
        {
2268
 
          result= drizzle_store_result(&drizzle);
2269
 
          while ((row = drizzle_fetch_row(result)))
 
2268
          result= drizzleclient_store_result(&drizzle);
 
2269
          while ((row = drizzleclient_fetch_row(result)))
2270
2270
            counter++;
2271
 
          drizzle_free_result(result);
 
2271
          drizzleclient_free_result(result);
2272
2272
        }
2273
 
      } while(drizzle_next_result(&drizzle) == 0);
 
2273
      } while(drizzleclient_next_result(&drizzle) == 0);
2274
2274
    }
2275
2275
    queries++;
2276
2276
 
2674
2674
  if (opt_only_print)
2675
2675
    return;
2676
2676
 
2677
 
  drizzle_close(drizzle);
 
2677
  drizzleclient_close(drizzle);
2678
2678
}
2679
2679
 
2680
2680
void
2690
2690
  if (opt_delayed_start)
2691
2691
    usleep(random()%opt_delayed_start);
2692
2692
 
2693
 
  drizzle_create(drizzle);
 
2693
  drizzleclient_create(drizzle);
2694
2694
 
2695
2695
  if (opt_compress)
2696
 
    drizzle_options(drizzle,DRIZZLE_OPT_COMPRESS,NULL);
 
2696
    drizzleclient_options(drizzle,DRIZZLE_OPT_COMPRESS,NULL);
2697
2697
 
2698
2698
  for (x= 0; x < 10; x++)
2699
2699
  {
2700
2700
 
2701
2701
 
2702
 
    if (drizzle_connect(drizzle, host, user, opt_password,
 
2702
    if (drizzleclient_connect(drizzle, host, user, opt_password,
2703
2703
                        connect_to_schema ? create_schema_string : NULL,
2704
2704
                        opt_drizzle_port,
2705
2705
                        opt_drizzle_unix_port,
2714
2714
  if (connect_error)
2715
2715
  {
2716
2716
    fprintf(stderr,"%s: Error when connecting to server: %d %s\n",
2717
 
            my_progname, drizzle_errno(drizzle), drizzle_error(drizzle));
 
2717
            my_progname, drizzleclient_errno(drizzle), drizzleclient_error(drizzle));
2718
2718
    exit(1);
2719
2719
  }
2720
2720