@@ -240,16 +240,21 @@ protected ObPayload commonExecute(ObTableClient client, Logger logger,
240240 throw e ;
241241 }
242242 } else if (e instanceof ObTableException ) {
243- if ((((ObTableException ) e ).getErrorCode () == ResultCodes .OB_TABLE_NOT_EXIST .errorCode || ((ObTableException ) e )
244- .getErrorCode () == ResultCodes .OB_NOT_SUPPORTED .errorCode || ((ObTableException ) e )
245- .getErrorCode () == ResultCodes .OB_SCHEMA_ERROR .errorCode )
246- && ((request instanceof ObTableQueryAsyncRequest && ((ObTableQueryAsyncRequest ) request ).getObTableQueryRequest ().getTableQuery ().isHbaseQuery ())
247- || (request instanceof ObTableQueryRequest && ((ObTableQueryRequest ) request ).getTableQuery ().isHbaseQuery ()))
243+ if ((((ObTableException ) e ).getErrorCode () == ResultCodes .OB_TABLE_NOT_EXIST .errorCode
244+ || ((ObTableException ) e ).getErrorCode () == ResultCodes .OB_NOT_SUPPORTED .errorCode || ((ObTableException ) e )
245+ .getErrorCode () == ResultCodes .OB_SCHEMA_ERROR .errorCode )
246+ && ((request instanceof ObTableQueryAsyncRequest && ((ObTableQueryAsyncRequest ) request )
247+ .getObTableQueryRequest ().getTableQuery ().isHbaseQuery ()) || (request instanceof ObTableQueryRequest && ((ObTableQueryRequest ) request )
248+ .getTableQuery ().isHbaseQuery ()))
248249 && client .getTableGroupInverted ().get (indexTableName ) != null ) {
249250 // table not exists && hbase mode && table group exists , three condition both
250251 client .eraseTableGroupFromCache (tableName );
251- indexTableName = client .tryGetTableNameFromTableGroupCache (tableName ,
252- true );
252+ String newIndexTableName = client .tryGetTableNameFromTableGroupCache (tableName , true );
253+ if (indexTableName .equalsIgnoreCase (newIndexTableName )) {
254+ throw new ObTableNotExistException ("multi column-family operations contain not existed table name" , ResultCodes .OB_ERR_UNKNOWN_TABLE .errorCode );
255+ } else {
256+ indexTableName = newIndexTableName ;
257+ }
253258 }
254259 if (((ObTableException ) e ).isNeedRefreshTableEntry ()) {
255260 needRefreshTableEntry = true ;
0 commit comments