← Back to branch summary

~vkolesnikov/pbxt/pbxt-maria-windows-app-ver-fixes

« back to all changes in this revision

Viewing changes to src/table_xt.cc

  • Committer: Paul McCullagh
  • Date: 2010-01-22 14:02:16 UTC
  • Revision ID: paul.mccullagh@primebase.org-20100122140216-5d03mjtcovhwewjx
Removed opened parameter which is no longer required

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/table_xt.cc
513
513
                xt_add_dir_char(PATH_MAX, pbuf);
514
514
                xt_strcat(PATH_MAX, pbuf, te_ptr->te_tab_name);
515
515
                try_(a) {
516
 
                        xt_heap_release(self, xt_use_table_no_lock(self, db, (XTPathStrPtr)pbuf, FALSE, FALSE, NULL, NULL));
 
516
                        xt_heap_release(self, xt_use_table_no_lock(self, db, (XTPathStrPtr)pbuf, FALSE, FALSE, NULL));
517
517
                } catch_(a) {
518
518
                        /* ignore errors */
519
519
                        xt_log_and_clear_warning(self);
663
663
                        xt_strcpy(PATH_MAX, path, te_ptr->te_tab_path->tp_path);
664
664
                        xt_add_dir_char(PATH_MAX, path);
665
665
                        xt_strcat(PATH_MAX, path, te_ptr->te_tab_name);
666
 
                        tab = xt_use_table(self, (XTPathStrPtr) path, FALSE, FALSE, NULL);
 
666
                        tab = xt_use_table(self, (XTPathStrPtr) path, FALSE, FALSE);
667
667
                        tab_check_table(self, tab);
668
668
                        xt_heap_release(self, tab);
669
669
                        tab = NULL;
1180
1180
 * Get a reference to a table in the current database. The table reference is valid,
1181
1181
 * as long as the thread is using the database!!!
1182
1182
 */
1183
 
xtPublic XTTableHPtr xt_use_table_no_lock(XTThreadPtr self, XTDatabaseHPtr db, XTPathStrPtr name, xtBool no_load, xtBool missing_ok, XTDictionaryPtr dic, xtBool *opened)
 
1183
xtPublic XTTableHPtr xt_use_table_no_lock(XTThreadPtr self, XTDatabaseHPtr db, XTPathStrPtr name, xtBool no_load, xtBool missing_ok, XTDictionaryPtr dic)
1184
1184
{
1185
1185
        XTTableHPtr tab;
1186
1186
 
1199
1199
 
1200
1200
                if (tab_new_handle(self, &tab, db, tab_id, name, FALSE, dic) == XT_TAB_NO_DICTIONARY)
1201
1201
                        xt_throw_taberr(XT_CONTEXT, XT_ERR_NO_DICTIONARY, name);
1202
 
 
1203
 
                if (opened)
1204
 
                        *opened = TRUE;
1205
1202
        }
1206
1203
        
1207
1204
        if (tab)
1546
1543
                 * as well.
1547
1544
                 */
1548
1545
                if (!old_tab_id) {
1549
 
                        tab = xt_use_table_no_lock(self, db, name, FALSE, FALSE, NULL, NULL);
 
1546
                        tab = xt_use_table_no_lock(self, db, name, FALSE, FALSE, NULL);
1550
1547
                        xt_heap_release(self, tab);
1551
1548
                }
1552
1549
        }
1574
1571
                        /* Same purpose as above {LOAD-FOR-FKS} (although this should work, 
1575
1572
                         * beacuse this is a TRUNCATE TABLE.
1576
1573
                         */
1577
 
                        tab = xt_use_table_no_lock(self, db, name, FALSE, FALSE, NULL, NULL);
 
1574
                        tab = xt_use_table_no_lock(self, db, name, FALSE, FALSE, NULL);
1578
1575
                        xt_heap_release(self, tab);
1579
1576
                }
1580
1577
                catch_(b) {
1617
1614
        /* this code is not needed anymore as we open tables referred by FKs as necessary during checks
1618
1615
        xt_ht_lock(self, db->db_tables);
1619
1616
        pushr_(xt_ht_unlock, db->db_tables);
1620
 
        tab = xt_use_table_no_lock(self, db, name, FALSE, FALSE, NULL, NULL);
 
1617
        tab = xt_use_table_no_lock(self, db, name, FALSE, FALSE, NULL);
1621
1618
        freer_(); // xt_ht_unlock(db->db_tables)
1622
1619
        xt_heap_release(self, tab);
1623
1620
        * CHANGED see {LOAD-FOR-FKS} above.
2118
2115
        popr_(); // Discard tab_free_table_path(te_new_path);
2119
2116
        popr_(); // Discard xt_free(te_new_name);
2120
2117
 
2121
 
        tab = xt_use_table_no_lock(self, db, new_name, FALSE, FALSE, &dic, NULL);
 
2118
        tab = xt_use_table_no_lock(self, db, new_name, FALSE, FALSE, &dic);
2122
2119
        /* All renamed tables are considered repaired! */
2123
2120
        xt_tab_table_repaired(tab);
2124
2121
        xt_heap_release(self, tab);
2128
2125
        freer_(); // xt_db_unlock_table_pool(table_pool)
2129
2126
}
2130
2127
 
2131
 
xtPublic XTTableHPtr xt_use_table(XTThreadPtr self, XTPathStrPtr name, xtBool no_load, xtBool missing_ok, xtBool *opened)
 
2128
xtPublic XTTableHPtr xt_use_table(XTThreadPtr self, XTPathStrPtr name, xtBool no_load, xtBool missing_ok)
2132
2129
{
2133
2130
        XTTableHPtr             tab;
2134
2131
        XTDatabaseHPtr  db = self->st_database;
2135
2132
 
2136
2133
        xt_ht_lock(self, db->db_tables);
2137
2134
        pushr_(xt_ht_unlock, db->db_tables);
2138
 
        tab = xt_use_table_no_lock(self, db, name, no_load, missing_ok, NULL, opened);
 
2135
        tab = xt_use_table_no_lock(self, db, name, no_load, missing_ok, NULL);
2139
2136
        freer_();
2140
2137
        return tab;
2141
2138
}