Make it compile after merge

Author: AlexPeshkoff

src/jrd/Relation.cpp

@@ -134,7 +134,7 @@ RelationPages* jrd_rel::getPagesInternal(thread_db* tdbb, TraNumber tran, bool a
 		for (auto& idx : indices)
 		{
 			MetaName idx_name;
-			MetadataCache::lookup_index(tdbb, idx_name, this->rel_name, idx->idx_id + 1);
+			MetadataCache::lookup_index(tdbb, idx_name, this->rel_name, idx.idx_id + 1);
 
 			idx.idx_root = 0;
 			SelectivityList selectivity(*pool);

src/jrd/Relation.h

@@ -52,7 +52,7 @@ class Trigger : public HazardObject
 
 	Firebird::HalfStaticArray<UCHAR, 128> blr;			// BLR code
 	Firebird::HalfStaticArray<UCHAR, 128> debugInfo;	// Debug info
-	JrdStatement* statement;							// Compiled statement
+	Statement* statement;								// Compiled statement
 	bool		releaseInProgress;
 	bool		sysTrigger;
 	FB_UINT64	type;						// Trigger type

src/jrd/met.epp

@@ -121,8 +121,7 @@ static void lookup_view_contexts(thread_db*, jrd_rel*);
 static void make_relation_scope_name(const TEXT*, const USHORT, string& str);
 static ValueExprNode* parse_field_default_blr(thread_db* tdbb, bid* blob_id);
 static BoolExprNode* parse_field_validation_blr(thread_db* tdbb, bid* blob_id, const MetaName name);
-static void save_trigger_data(thread_db*, TrigVectorPtr*, jrd_rel*, JrdStatement*, blb*, blb*,
-static bool resolve_charset_and_collation(thread_db*, USHORT*, const UCHAR*, const UCHAR*);
+static void save_trigger_data(thread_db*, TrigVectorPtr*, jrd_rel*, Statement*, blb*, blb*,
 	const TEXT*, FB_UINT64, bool, USHORT, const MetaName&, const string&,
 	const bid*, Nullable<bool> ssDefiner);
 static void scan_partners(thread_db*, jrd_rel*);
@@ -5523,7 +5522,7 @@ void MetadataCache::runDBTriggers(thread_db* tdbb, TriggerAction action)
 }
 
 // Find an inactive incarnation of a system request. If necessary, clone it.
-jrd_req* MetadataCache::findSystemRequest(thread_db* tdbb, USHORT id, InternalRequest which)
+Request* MetadataCache::findSystemRequest(thread_db* tdbb, USHORT id, InternalRequest which)
 {
 	static const int MAX_RECURSION = 100;
 
@@ -5533,7 +5532,7 @@ jrd_req* MetadataCache::findSystemRequest(thread_db* tdbb, USHORT id, InternalRe
 
 	fb_assert(which == IRQ_REQUESTS || which == DYN_REQUESTS);
 
-	JrdStatement* statement = (which == IRQ_REQUESTS ? mdc_internal[id] : mdc_dyn_req[id]);
+	Statement* statement = (which == IRQ_REQUESTS ? mdc_internal[id] : mdc_dyn_req[id]);
 
 	if (!statement)
 		return NULL;
@@ -5549,7 +5548,7 @@ jrd_req* MetadataCache::findSystemRequest(thread_db* tdbb, USHORT id, InternalRe
 			// Msg363 "request depth exceeded. (Recursive definition?)"
 		}
 
-		jrd_req* clone = statement->getRequest(tdbb, n);
+		Request* clone = statement->getRequest(tdbb, n);
 
 		if (!(clone->req_flags & (req_active | req_reserved)))
 		{
@@ -5803,10 +5802,10 @@ void Trigger::compile(thread_db* tdbb)
 			statement->triggerInvoker = att->getUserId(owner);
 
 		if (sysTrigger)
-			statement->flags |= JrdStatement::FLAG_SYS_TRIGGER;
+			statement->flags |= Statement::FLAG_SYS_TRIGGER;
 
 		if (flags & TRG_ignore_perm)
-			statement->flags |= JrdStatement::FLAG_IGNORE_PERM;
+			statement->flags |= Statement::FLAG_IGNORE_PERM;
 	}
 }
 

src/jrd/met.h

@@ -173,7 +173,7 @@ class jrd_prc : public Routine
 
 	virtual SLONG getSclType() const
 	{
-		return SCL_object_procedure;
+		return obj_procedure;
 	}
 
 	virtual void releaseFormat()
@@ -282,7 +282,7 @@ class MetadataCache : public Firebird::PermanentStorage
 
 	~MetadataCache();
 
-	jrd_req* findSystemRequest(thread_db* tdbb, USHORT id, InternalRequest which);
+	Request* findSystemRequest(thread_db* tdbb, USHORT id, InternalRequest which);
 
 	void releaseIntlObjects(thread_db* tdbb);			// defined in intl.cpp
 	void destroyIntlObjects(thread_db* tdbb);			// defined in intl.cpp
@@ -300,7 +300,7 @@ class MetadataCache : public Firebird::PermanentStorage
 	void releaseTrigger(thread_db* tdbb, USHORT triggerId, const MetaName& name);
 	TrigVectorPtr* getTriggers(USHORT triggerId);
 
-	void cacheRequest(InternalRequest which, USHORT id, JrdStatement* stmt)
+	void cacheRequest(InternalRequest which, USHORT id, Statement* stmt)
 	{
 		if (which == IRQ_REQUESTS)
 			mdc_internal[id] = stmt;
@@ -426,8 +426,8 @@ class MetadataCache : public Firebird::PermanentStorage
 	HazardArray<Function>			mdc_functions;			// User defined functions
 	HazardArray<Generator>			mdc_generators;
 
-	Firebird::Array<JrdStatement*>	mdc_internal;			// internal statements
-	Firebird::Array<JrdStatement*>	mdc_dyn_req;			// internal dyn statements
+	Firebird::Array<Statement*>	mdc_internal;				// internal statements
+	Firebird::Array<Statement*>	mdc_dyn_req;				// internal dyn statements
 
 	Firebird::Array<CharSetContainer*>	mdc_charsets;		// intl character set descriptions
 	Firebird::GenericMap<Firebird::Pair<Firebird::Left<

src/jrd/tra.cpp

@@ -37,7 +37,6 @@
 #include "../jrd/req.h"
 #include "../jrd/exe.h"
 #include "../jrd/extds/ExtDS.h"
-#include "../jrd/rse.h"
 #include "../jrd/met.h"
 #include "../jrd/intl_classes.h"
 #include "../common/ThreadStart.h"

src/jrd/trace/TraceObjects.cpp

@@ -706,11 +706,12 @@ const char* TraceStatusVectorImpl::getText()
 	return m_error.c_str();
 }
 
-TraceProcedureImpl::TraceProcedureImpl(jrd_req* request, Firebird::PerformanceInfo* perf) :
+TraceProcedureImpl::TraceProcedureImpl(Request* request, Firebird::PerformanceInfo* perf) :
 	m_request(request),
 	m_perf(perf),
 	m_inputs(*getDefaultMemoryPool(), request->req_proc_caller, request->req_proc_inputs),
 	m_name(m_request->getStatement()->procedure->getName().toString())
 {}
 
+
 } // namespace Jrd

src/jrd/trace/TraceObjects.h

@@ -402,12 +402,7 @@ class TraceProcedureImpl :
 	public Firebird::AutoIface<Firebird::ITraceProcedureImpl<TraceProcedureImpl, Firebird::CheckStatusWrapper> >
 {
 public:
-	TraceProcedureImpl(Request* request, Firebird::PerformanceInfo* perf) :
-		m_request(request),
-		m_perf(perf),
-		m_inputs(*getDefaultMemoryPool(), request->req_proc_caller, request->req_proc_inputs),
-		m_name(m_request->getStatement()->procedure->getName().toString())
-	{}
+	TraceProcedureImpl(Request* request, Firebird::PerformanceInfo* perf);
 
 	// TraceProcedure implementation
 	const char* getProcName()