@ebyhr addrressed your feedback except for the last one as I dont see a way to add those session properties in test framework.

Could you rebase on master to resolve conflicts?

Could you rebase on master to resolve conflicts?

@ebyhr Done

Please fix CI failure and add a query based test to BasePinotConnectorSmokeTest

Error:    TestDynamicTable.testQueryOptions:469 
expected: 
  "SET useMultistageEngine = true;
  SET skipUpsert = true;
  SELECT "FlightNum" FROM realtimeOnly_REALTIME LIMIT 50"
 but was: 
  "SET useMultistageEngine = true;
  SET skipUpsert = true;SELECT "FlightNum" FROM realtimeOnly_REALTIME LIMIT 50"

@ebyhr review again?

@naman-patel Please handle #21902 (comment)

@ebyhr @findinpath All things are addressed. If you merge this I have few more PRs for pinot connector. This is really blocking me at the moment.