adding recreate flag when create tisession

core/src/main/scala/org/apache/spark/sql/TiContext.scala

@@ -43,7 +43,7 @@ class TiContext(val sparkSession: SparkSession, options: Option[TiDBOptions] = N
   lazy val sqlContext: SQLContext = sparkSession.sqlContext
   val conf: SparkConf = mergeWithDataSourceConfig(sparkSession.sparkContext.conf, options)
   val tiConf: TiConfiguration = TiUtil.sparkConfToTiConf(conf)
-  val tiSession: TiSession = TiSession.getInstance(tiConf)
+  val tiSession: TiSession = TiSession.getInstance(tiConf, true)
   val meta: MetaManager = new MetaManager(tiSession.getCatalog)
 
   StatisticsManager.initStatisticsManager(tiSession)

core/src/test/scala/com/pingcap/tispark/datasource/BaseDataSourceTest.scala

@@ -36,8 +36,6 @@ class BaseDataSourceTest(val table: String,
 
   protected def dropTable(): Unit = {
     jdbcUpdate(s"drop table if exists $dbtable")
-    // If we reuse tiSession, cache in catalog will be outdated after dropping and creating table.
-    TiSession.clearCache()
   }
 
   protected def dropTable(tblName: String): Unit = {

tikv-client/src/main/java/com/pingcap/tikv/TiSession.java

@@ -45,12 +45,10 @@ public class TiSession implements AutoCloseable {
 
   private static final Map<String, TiSession> sessionCachedMap = new HashMap<>();
 
-  // Since we create session as singleton now, configuration change will not
-  // reflect change
-  public static TiSession getInstance(TiConfiguration conf) {
+  public static TiSession getInstance(TiConfiguration conf, boolean recreate) {
     synchronized (sessionCachedMap) {
       String key = conf.getPdAddrsString();
-      if (sessionCachedMap.containsKey(key)) {
+      if (sessionCachedMap.containsKey(key) && !recreate) {
         return sessionCachedMap.get(key);
       }
 
@@ -60,6 +58,12 @@ public static TiSession getInstance(TiConfiguration conf) {
     }
   }
 
+  // Since we create session as singleton now, configuration change will not
+  // reflect change
+  public static TiSession getInstance(TiConfiguration conf) {
+    return getInstance(conf, false);
+  }
+
   private TiSession(TiConfiguration conf) {
     this.conf = conf;
     this.channelFactory = new ChannelFactory(conf.getMaxFrameSize());
@@ -188,12 +192,6 @@ public void injectCallBackFunc(Function<CacheInvalidateEvent, Void> callBackFunc
     this.cacheInvalidateCallback = callBackFunc;
   }
 
-  public static void clearCache() {
-    synchronized (sessionCachedMap) {
-      sessionCachedMap.clear();
-    }
-  }
-
   @Override
   public synchronized void close() throws Exception {
     synchronized (sessionCachedMap) {

tikv-client/src/test/java/com/pingcap/tikv/txn/LockResolverSITest.java

@@ -41,7 +41,6 @@ public class LockResolverSITest extends LockResolverTest {
   public void setUp() {
     TiConfiguration conf = TiConfiguration.createDefault("127.0.0.1:2379");
     conf.setIsolationLevel(IsolationLevel.SI);
-    TiSession.clearCache();
     try {
       session = TiSession.getInstance(conf);
       this.builder = session.getRegionStoreClientBuilder();