better compatibility in EngineJoin

dbms/src/Interpreters/AnalyzedJoin.cpp

@@ -213,6 +213,22 @@ bool AnalyzedJoin::sameJoin(const AnalyzedJoin * x, const AnalyzedJoin * y)
         && x->columns_added_by_join == y->columns_added_by_join;
 }
 
+bool AnalyzedJoin::sameStrictnessAndKind(ASTTableJoin::Strictness strictness_, ASTTableJoin::Kind kind_) const
+{
+    if (strictness_ == strictness() && kind_ == kind())
+        return true;
+
+    /// Compatibility: old ANY INNER == new SEMI LEFT
+    if (strictness_ == ASTTableJoin::Strictness::Semi && isLeft(kind_) &&
+        strictness() == ASTTableJoin::Strictness::RightAny && isInner(kind()))
+        return true;
+    if (strictness() == ASTTableJoin::Strictness::Semi && isLeft(kind()) &&
+        strictness_ == ASTTableJoin::Strictness::RightAny && isInner(kind_))
+        return true;
+
+    return false;
+}
+
 JoinPtr makeJoin(std::shared_ptr<AnalyzedJoin> table_join, const Block & right_sample_block)
 {
     auto kind = table_join->kind();

dbms/src/Interpreters/AnalyzedJoin.h

@@ -84,6 +84,7 @@ public:
 
     ASTTableJoin::Kind kind() const { return table_join.kind; }
     ASTTableJoin::Strictness strictness() const { return table_join.strictness; }
+    bool sameStrictnessAndKind(ASTTableJoin::Strictness, ASTTableJoin::Kind) const;
     const SizeLimits & sizeLimits() const { return size_limits; }
     VolumePtr getTemporaryVolume() { return tmp_volume; }
 

dbms/src/Storages/StorageJoin.cpp

@@ -70,7 +70,7 @@ void StorageJoin::truncate(const ASTPtr &, const Context &, TableStructureWriteL
 
 HashJoinPtr StorageJoin::getJoin(std::shared_ptr<AnalyzedJoin> analyzed_join) const
 {
-    if (kind != analyzed_join->kind() || strictness != analyzed_join->strictness())
+    if (!analyzed_join->sameStrictnessAndKind(strictness, kind))
         throw Exception("Table " + getStorageID().getNameForLogs() + " has incompatible type of JOIN.", ErrorCodes::INCOMPATIBLE_TYPE_OF_JOIN);
 
     if ((analyzed_join->forceNullableRight() && !use_nulls) ||