sql: turn on hstream_enable_schema flag by default (#1550)

* sql: fix incorrect subquery planning

* sql: turn on `hstream_enable_schema` flag by default

Makefile

@@ -15,7 +15,7 @@ HSTREAM_VERSION ?= $(or $(shell git describe --tag --abbrev=0 2>/dev/null), unkn
 HSTREAM_VERSION_COMMIT ?= $(or $(shell git rev-parse HEAD 2>/dev/null), unknown)
 
 ENGINE_VERSION ?= v1
-SQL_ENABLE_SCHEMA ?= false
+SQL_ENABLE_SCHEMA ?= true
 
 ifeq ($(strip $(SQL_ENABLE_SCHEMA)), true)
 CABAL_BUILD_FLAGS += +hstream_enable_schema

common/hstream/hstream-common.cabal

@@ -101,6 +101,7 @@ library
     , bytestring
     , casing                >=0.1.4
     , containers
+    , cryptonite
     , data-default
     , deepseq
     , digest
@@ -115,6 +116,7 @@ library
     , hstream-common-base
     , http-client
     , http-types
+    , memory
     , optparse-applicative
     , primitive             ^>=0.7
     , proto3-suite
@@ -132,8 +134,6 @@ library
     , zlib
     , zoovisitor
     , zstd
-    , memory
-    , cryptonite
 
   cxx-options:        -std=c++17
   cpp-options:        -std=c++17

hstream-processing/hstream-processing.cabal

@@ -29,7 +29,7 @@ flag ReleaseBuild
     Enables all optimisations, leads to slower build time and better performance
 
 flag hstream_enable_schema
-  default:     False
+  default:     True
   description:
     Save schema with streams and enable schema-related pipelines
 

hstream-sql/etc/plan-test-cases.yaml

@@ -4,29 +4,29 @@
 testSuiteCases:
 - testCaseFail: null
   testCaseLabel: not(BETWEEN)
-  testCaseResult: "Project (name=xNOTBETWEENSYMMETRIC0AND42, alias=xNOTBETWEENSYMMETRIC0AND42)
-    []\n  Affiliate (name=xNOTBETWEENSYMMETRIC0AND42, expr=OpNotBetweenSymAnd(#(x),
-    ConstantInt 0, ConstantInt 42)) \n    StreamScan s"
+  testCaseResult: |-
+    Project (OpNotBetweenSymAnd(0.#0,0,42)) | (#0_xNOTBETWEENSYMMETRIC0AND42:bool)
+      Scan s | (#0_x:int)
   testCaseStmts:
   - select x not between symmetric 0 and 42 from s;
 - testCaseFail: null
   testCaseLabel: not(BETWEEN)
-  testCaseResult: "Project (name=xNOTBETWEENSYMMETRIC0AND42, alias=xNOTBETWEENSYMMETRIC0AND42)
-    []\n  Affiliate (name=xNOTBETWEENSYMMETRIC0AND42, expr=OpNotBetweenSymAnd(#(x),
-    ConstantInt 0, ConstantInt 42)) \n    StreamScan s"
+  testCaseResult: |-
+    Project (OpNotBetweenSymAnd(0.#0,0,42)) | (#0_xNOTBETWEENSYMMETRIC0AND42:bool)
+      Scan s | (#0_x:int)
   testCaseStmts:
   - select x not between symmetric 0 and 42 from s;
 - testCaseFail: null
   testCaseLabel: not(BETWEEN)
-  testCaseResult: "Project (name=xNOTBETWEENSYMMETRIC0AND42, alias=xNOTBETWEENSYMMETRIC0AND42)
-    []\n  Affiliate (name=xNOTBETWEENSYMMETRIC0AND42, expr=OpNotBetweenSymAnd(#(x),
-    ConstantInt 0, ConstantInt 42)) \n    StreamScan s"
+  testCaseResult: |-
+    Project (OpNotBetweenSymAnd(0.#0,0,42)) | (#0_xNOTBETWEENSYMMETRIC0AND42:bool)
+      Scan s | (#0_x:int)
   testCaseStmts:
   - select x not between symmetric 0 and 42 from s;
 - testCaseFail: null
   testCaseLabel: not(BETWEEN)
-  testCaseResult: "Project (name=xNOTBETWEENSYMMETRIC0AND42, alias=xNOTBETWEENSYMMETRIC0AND42)
-    []\n  Affiliate (name=xNOTBETWEENSYMMETRIC0AND42, expr=OpNotBetweenSymAnd(#(x),
-    ConstantInt 0, ConstantInt 42)) \n    StreamScan s"
+  testCaseResult: |-
+    Project (OpNotBetweenSymAnd(0.#0,0,42)) | (#0_xNOTBETWEENSYMMETRIC0AND42:bool)
+      Scan s | (#0_x:int)
   testCaseStmts:
   - select x not between symmetric 0 and 42 from s;