Browse Source

HPCC-15878 - Minor leaks reported from Valgrind

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 years ago
parent
commit
24b44aa745
3 changed files with 1 additions and 18 deletions
  1. 0 1
      roxie/ccd/ccd.hpp
  2. 0 16
      roxie/ccd/ccdmain.cpp
  3. 1 1
      roxie/ccd/ccdprotocol.cpp

+ 0 - 1
roxie/ccd/ccd.hpp

@@ -324,7 +324,6 @@ extern IPropertyTree *ccdChannels;
 extern IPropertyTree *topology;
 extern MapStringTo<int> *preferredClusters;
 extern StringArray allQuerySetNames;
-extern IProperties *targetAliases;
 
 extern bool allFilesDynamic;
 extern bool lockSuperFiles;

+ 0 - 16
roxie/ccd/ccdmain.cpp

@@ -92,7 +92,6 @@ StringBuffer topologyFile;
 CriticalSection ccdChannelsCrit;
 IPropertyTree* ccdChannels;
 StringArray allQuerySetNames;
-IProperties *targetAliases;
 
 bool allFilesDynamic;
 bool lockSuperFiles;
@@ -901,21 +900,6 @@ int STARTQUERY_API start_query(int argc, const char *argv[])
         topology->addPropBool("@linuxOS", true);
 #endif
         allQuerySetNames.appendListUniq(topology->queryProp("@querySets"), ",");
-        targetAliases = createProperties();
-        StringArray tempList;
-        tempList.appendListUniq(topology->queryProp("@targetAliases"), ",");
-        ForEachItemIn(i, tempList)
-        {
-            const char *alias = tempList.item(i);
-            const char *eq = strchr(alias, '=');
-            if (eq)
-            {
-                StringAttr name(alias, eq-alias);
-                if (!allQuerySetNames.contains(name))
-                    targetAliases->setProp(name.str(), ++eq);
-            }
-        }
-
         Owned<IPropertyTreeIterator> roxieServers = topology->getElements("./RoxieServerProcess");
         ForEach(*roxieServers)
         {

+ 1 - 1
roxie/ccd/ccdprotocol.cpp

@@ -76,7 +76,7 @@ public:
     ProtocolListener(IHpccProtocolMsgSink *_sink) : Thread("RoxieListener")
     {
         running = false;
-        sink.set(dynamic_cast<IHpccNativeProtocolMsgSink*>(_sink));
+        sink.setown(dynamic_cast<IHpccNativeProtocolMsgSink*>(_sink));
     }
     virtual IHpccProtocolMsgSink *queryMsgSink()
     {