HPCC-30285 Review changes

Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · Sep 15, 2023 · f3f4b53 · f3f4b53
1 parent 4ec4be4
commit f3f4b53
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/ecl/hql/hqlgram.y b/ecl/hql/hqlgram.y
@@ -3522,9 +3522,6 @@ outputFlag
                             $$.setPosition($1);
                         }
     | compressionOptions
-                        {
-                            $$.setExpr($1.getExpr());
-                        }
     | __GROUPED__       {
                             $$.setExpr(createAttribute(groupedAtom));
                             $$.setPosition($1);

diff --git a/ecl/hql/reservedwords.cpp b/ecl/hql/reservedwords.cpp
@@ -476,6 +476,7 @@ static const char * eclReserved14[] = { //Attribute functions (some might actual
     "timelimit",
     "timeout",
     "token",
+    "uncompressed",
     "unstable",
     "update",
     "use",

diff --git a/ecl/hthor/hthor.cpp b/ecl/hthor/hthor.cpp
@@ -382,6 +382,8 @@ ClusterWriteHandler *createClusterWriteHandler(IAgentContext &agent, IHThorIndex
             clusterHandler.setown(new CHThorClusterWriteHandler(lfn, "OUTPUT", agent));
         }
         clusterHandler->addCluster(cluster);
+
+        // This is checking that all output planes agree on compression being used or not
         Owned<IPropertyTree> plane = getStoragePlane(cluster);
         bool thisPlaneCompressed = plane ? plane->getPropBool("@compressLogicalFiles") : false;
         if (1 == clusterIdx)
@@ -554,7 +556,7 @@ void CHThorDiskWriteActivity::resolve()
             {
                 StringArray clusterNames;
                 clusterHandler->getClusters(clusterNames);
-                planeName.set(clusterNames.item(0)); // NB: only bother with 1st, if multilple createClusterWriteHandler validates if same
+                planeName.set(clusterNames.item(0)); // NB: only bother with 1st, if multiple createClusterWriteHandler validates if same
             }
             else
                 getDefaultStoragePlane(planeName);

diff --git a/roxie/ccd/ccdserver.cpp b/roxie/ccd/ccdserver.cpp
@@ -11969,6 +11969,8 @@ class CRoxieServerDiskWriteActivity : public CRoxieServerInternalSinkActivity, i
                 break;
             clusters.append(cluster);
             clusterIdx++;
+
+            // This is checking that all output planes agree on compression being used or not
             Owned<IPropertyTree> plane = getStoragePlane(cluster);
             bool thisPlaneCompressed = plane ? plane->getPropBool("@compressLogicalFiles", outputCompressionDefault) : outputCompressionDefault;
             if (1 == clusterIdx)

diff --git a/thorlcr/activities/thdiskbase.cpp b/thorlcr/activities/thdiskbase.cpp
@@ -177,6 +177,8 @@ void CWriteMasterBase::init()
                 break;
             clusters.append(cluster);
             idx++;
+
+            // This is checking that all output planes agree on compression being used or not
             Owned<IPropertyTree> plane = getStoragePlane(cluster);
             bool thisPlaneCompressed = plane ? plane->getPropBool("@compressLogicalFiles", outputCompressionDefault) : outputCompressionDefault;
             if (1 == idx)