many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
POOLMEM *fname; /* Filename only */
POOLMEM *path; /* Path only */
POOLMEM *esc_name; /* Escaped file name */
- POOLMEM *esc_name2; /* Escaped path name */
+ POOLMEM *esc_path; /* Escaped path name */
int fnl; /* file name length */
int pnl; /* path name length */
};
#define sql_fetch_field(x) my_sqlite_fetch_field(x)
#define sql_num_fields(x) ((x)->ncolumn)
#define SQL_ROW char**
-#define sql_batch_start(x) db_batch_start(x)
-#define sql_batch_end(x,y) db_batch_end(x,y)
-#define sql_batch_insert(x,y) db_batch_insert(x,y)
+
+#define sql_batch_start(x,y) my_batch_start(x,y)
+#define sql_batch_end(x,y,z) my_batch_end(x,y,z)
+#define sql_batch_insert(x,y,z) my_batch_insert(x,y,z)
#define sql_batch_lock_path_query my_sqlite_batch_lock_query
#define sql_batch_lock_filename_query my_sqlite_batch_lock_query
#define sql_batch_unlock_tables_query my_sqlite_batch_unlock_query
POOLMEM *fname; /* Filename only */
POOLMEM *path; /* Path only */
POOLMEM *esc_name; /* Escaped file name */
- POOLMEM *esc_name2; /* Escaped path name */
+ POOLMEM *esc_path; /* Escaped path name */
int fnl; /* file name length */
int pnl; /* path name length */
};
#define sql_field_seek(x, y) my_sqlite_field_seek((x), (y))
#define sql_fetch_field(x) my_sqlite_fetch_field(x)
#define sql_num_fields(x) ((x)->ncolumn)
+#define sql_batch_start(x,y) my_batch_start(x,y)
+#define sql_batch_end(x,y,z) my_batch_end(x,y,z)
+#define sql_batch_insert(x,y,z) my_batch_insert(x,y,z)
#define SQL_ROW char**
-#define sql_batch_start(x) db_batch_start(x)
-#define sql_batch_end(x,y) db_batch_end(x,y)
-#define sql_batch_insert(x,y) db_batch_insert(x,y)
#define sql_batch_lock_path_query my_sqlite_batch_lock_query
#define sql_batch_lock_filename_query my_sqlite_batch_lock_query
#define sql_batch_unlock_tables_query my_sqlite_batch_unlock_query
POOLMEM *fname; /* Filename only */
POOLMEM *path; /* Path only */
POOLMEM *esc_name; /* Escaped file name */
- POOLMEM *esc_name2; /* Escaped path name */
+ POOLMEM *esc_path; /* Escaped path name */
int fnl; /* file name length */
int pnl; /* path name length */
};
/* "Generic" names for easier conversion */
#define sql_store_result(x) mysql_store_result((x)->db)
#define sql_use_result(x) mysql_use_result((x)->db)
-#define sql_free_result(x) mysql_free_result((x)->result)
+#define sql_free_result(x) my_mysql_free_result(x)
#define sql_fetch_row(x) mysql_fetch_row((x)->result)
#define sql_query(x, y) mysql_query((x)->db, (y))
-#define sql_close(x) mysql_close((x)->db)
#define sql_strerror(x) mysql_error((x)->db)
#define sql_num_rows(x) mysql_num_rows((x)->result)
#define sql_data_seek(x, i) mysql_data_seek((x)->result, (i))
#define sql_field_seek(x, y) mysql_field_seek((x)->result, (y))
#define sql_fetch_field(x) mysql_fetch_field((x)->result)
#define sql_num_fields(x) (int)mysql_num_fields((x)->result)
-#define sql_batch_start(x) db_batch_start(x)
-#define sql_batch_end(x,y) db_batch_end(x,y)
-#define sql_batch_insert(x,y) db_batch_insert(x,y)
+#define SQL_ROW MYSQL_ROW
+#define SQL_FIELD MYSQL_FIELD
+
+#define sql_batch_start(x,y) my_batch_start(x,y)
+#define sql_batch_end(x,y,z) my_batch_end(x,y,z)
+#define sql_batch_insert(x,y,z) my_batch_insert(x,y,z)
#define sql_batch_lock_path_query my_mysql_batch_lock_path_query
#define sql_batch_lock_filename_query my_mysql_batch_lock_filename_query
#define sql_batch_unlock_tables_query my_mysql_batch_unlock_tables_query
#define sql_batch_fill_filename_query my_mysql_batch_fill_filename_query
#define sql_batch_fill_path_query my_mysql_batch_fill_path_query
-#define SQL_ROW MYSQL_ROW
-#define SQL_FIELD MYSQL_FIELD
-int my_mysql_batch_start(B_DB *mdb);
extern char* my_mysql_batch_lock_path_query;
extern char* my_mysql_batch_lock_filename_query;
extern char* my_mysql_batch_unlock_tables_query;
extern char* my_mysql_batch_fill_filename_query;
extern char* my_mysql_batch_fill_path_query;
+extern void my_mysql_free_result(B_DB *mdb);
#else
POSTGRESQL_ROW row;
POSTGRESQL_FIELD *fields;
int num_rows;
+ int row_size; /* size of malloced rows */
int num_fields;
- int row_number; /* what row number did we get via my_postgresql_data_seek? */
- int field_number; /* what field number did we get via my_postgresql_field_seek? */
+ int fields_size; /* size of malloced fields */
+ int row_number; /* row number from my_postgresql_data_seek */
+ int field_number; /* field number from my_postgresql_field_seek */
int ref_count;
char *db_name;
char *db_user;
POOLMEM *fname; /* Filename only */
POOLMEM *path; /* Path only */
POOLMEM *esc_name; /* Escaped file name */
- POOLMEM *esc_name2; /* Escaped path name */
+ POOLMEM *esc_path; /* Escaped path name */
int fnl; /* file name length */
int pnl; /* path name length */
};
int my_postgresql_currval (B_DB *mdb, char *table_name);
void my_postgresql_field_seek (B_DB *mdb, int row);
POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb);
-int my_postgresql_lock_table(B_DB *mdb, const char *table);
-int my_postgresql_unlock_table(B_DB *mdb);
-int my_postgresql_batch_start(B_DB *mdb);
-int my_postgresql_batch_end(B_DB *mdb, const char *error);
+
+int my_postgresql_batch_start(JCR *jcr, B_DB *mdb);
+int my_postgresql_batch_end(JCR *jcr, B_DB *mdb, const char *error);
typedef struct ATTR_DBR ATTR_DBR;
-int my_postgresql_batch_insert(B_DB *mdb, ATTR_DBR *ar);
+int my_postgresql_batch_insert(JCR *jcr, B_DB *mdb, ATTR_DBR *ar);
char *my_postgresql_copy_escape(char *dest, char *src, size_t len);
extern char* my_pg_batch_lock_path_query;
#define sql_field_seek(x, y) my_postgresql_field_seek((x), (y))
#define sql_fetch_field(x) my_postgresql_fetch_field(x)
#define sql_num_fields(x) ((x)->num_fields)
-#define sql_batch_start(x) my_postgresql_batch_start(x)
-#define sql_batch_end(x,y) my_postgresql_batch_end(x,y)
-#define sql_batch_insert(x,y) my_postgresql_batch_insert(x,y)
-#define sql_lock_table(x,y) my_postgresql_lock_table(x, y)
-#define sql_unlock_table(x,y) my_postgresql_unlock_table(x)
+
+#define sql_batch_start(x,y) my_postgresql_batch_start(x,y)
+#define sql_batch_end(x,y,z) my_postgresql_batch_end(x,y,z)
+#define sql_batch_insert(x,y,z) my_postgresql_batch_insert(x,y,z)
#define sql_batch_lock_path_query my_pg_batch_lock_path_query
#define sql_batch_lock_filename_query my_pg_batch_lock_filename_query
#define sql_batch_unlock_tables_query my_pg_batch_unlock_tables_query
#endif /* __SQL_C */
+/* ==============================================================
+ *
+ * What follows are definitions that are used "globally" for all
+ * the different SQL engines and both inside and external to the
+ * cats directory.
+ */
+
extern uint32_t bacula_db_version;
-/* ***FIXME*** FileId_t should *really* be uint64_t
- * but at the current time, this breaks MySQL.
+/*
+ * These are the sizes of the current definitions of database
+ * Ids. In general, FileId_t can be set to uint64_t and it
+ * *should* work. Users have reported back that it does work
+ * for PostgreSQL. For the other types, all places in Bacula
+ * have been converted, but no one has actually tested it.
+ * In principle, the only field that really should need to be
+ * 64 bits is the FileId_t
*/
typedef uint32_t FileId_t;
typedef uint32_t DBId_t; /* general DB id type */
#define faddr_t long
+/*
+ * Structure used when calling db_get_query_ids()
+ * allows the subroutine to return a list of ids.
+ */
+class dbid_list : public SMARTALLOC {
+public:
+ DBId_t *DBId; /* array of DBIds */
+ char *PurgedFiles; /* Array of PurgedFile flags */
+ int num_ids; /* num of ids actually stored */
+ int max_ids; /* size of id array */
+ int num_seen; /* number of ids processed */
+ int tot_ids; /* total to process */
+
+ dbid_list(); /* in sql.c */
+ ~dbid_list(); /* in sql.c */
+};
+
+
+
/* Job information passed to create job record and update
* job record at end of job. Note, although this record
projects / bacula / bacula / blobdiff