浏览代码

HPCC-8081 Fix compilation errors from HPCC-8014

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
Renato Golin 12 年之前
父节点
当前提交
7bb9664d2e
共有 5 个文件被更改,包括 15 次插入15 次删除
  1. 1 1
      common/fileview2/fvrelate.cpp
  2. 1 1
      dali/datest/dfuwutest.cpp
  3. 11 11
      dali/daunittest/dautdfs.cpp
  4. 1 1
      dali/dfu/dfuutil.cpp
  5. 1 1
      dali/sasha/saxref.cpp

+ 1 - 1
common/fileview2/fvrelate.cpp

@@ -373,7 +373,7 @@ void ViewFileWeb::gatherWebFromPattern(const char * filenamePattern, const ViewG
     if (!localOptions.kind)
         localOptions.kind = S_LINK_RELATIONSHIP_KIND;
 
-    Owned<IDistributedFileIterator> iter = queryDistributedFileDirectory().getIterator(filenamePattern, false, NULL);
+    Owned<IDistributedFileIterator> iter = queryDistributedFileDirectory().getIterator(filenamePattern, false, UNKNOWN_USER);
     if (iter->first())
     {
         do

+ 1 - 1
dali/datest/dfuwutest.cpp

@@ -703,7 +703,7 @@ void testSuperRemoteCopy(const char *remoteip,const char *file)
     Owned<IDfuFileCopier> copier = createRemoteFileCopier("dfuserver_queue","thor","Test1",true);
     Owned<IDFUhelper> helper = createIDFUhelper();
     SocketEndpoint ep(remoteip);
-    helper->superForeignCopy(file,ep,file,NULL,NULL,false,copier);
+    helper->superForeignCopy(file,ep,file,UNKNOWN_USER,UNKNOWN_USER,false,copier);
 }
 
 

+ 11 - 11
dali/daunittest/dautdfs.cpp

@@ -55,7 +55,7 @@ class TTestDFS : public CPPUNIT_NS::TestFixture
     {
         StringArray superfiles;
         StringArray files;
-        Owned<IDistributedFileIterator> iter = dfsdir->getIterator(DFSUTSCOPE "::*", true);
+        Owned<IDistributedFileIterator> iter = dfsdir->getIterator(DFSUTSCOPE "::*", true, UNKNOWN_USER);
         ForEach(*iter) {
             IDistributedFile &file = iter->query();
             if (file.querySuperFile())
@@ -65,10 +65,10 @@ class TTestDFS : public CPPUNIT_NS::TestFixture
         }
         iter.clear();
         ForEachItemIn(i,superfiles) {
-            dfsdir->removeEntry(superfiles.item(i));
+            dfsdir->removeEntry(superfiles.item(i), UNKNOWN_USER);
         }
         ForEachItemIn(j,files) {
-            dfsdir->removeEntry(files.item(j));
+            dfsdir->removeEntry(files.item(j), UNKNOWN_USER);
         }
     }
 
@@ -172,9 +172,9 @@ protected:
         fdesc->setNumParts(1);
         fdesc->addCluster(grp,mapping);
         Owned<IDistributedFile> file = queryDistributedFileDirectory().createNew(fdesc);
-        file->attach(DFSUTSCOPE "::testfile1");
+        file->attach(DFSUTSCOPE "::testfile1", UNKNOWN_USER);
         file.clear();
-        file.setown(dfsdir->lookup(DFSUTSCOPE "::testfile1"));
+        file.setown(dfsdir->lookup(DFSUTSCOPE "::testfile1", UNKNOWN_USER));
         CPPUNIT_ASSERT(file.get()!=NULL);
         CPPUNIT_ASSERT(file->numParts()==1);
         CPPUNIT_ASSERT(file->numCopies(0)==2);
@@ -210,9 +210,9 @@ protected:
         fdesc->setNumParts(8);
         fdesc->addCluster(grp,mapping);
         file.setown(queryDistributedFileDirectory().createNew(fdesc));
-        file->attach(DFSUTSCOPE "::testfile2");
+        file->attach(DFSUTSCOPE "::testfile2", UNKNOWN_USER);
         file.clear();
-        file.setown(dfsdir->lookup(DFSUTSCOPE "::testfile2"));
+        file.setown(dfsdir->lookup(DFSUTSCOPE "::testfile2", UNKNOWN_USER));
         CPPUNIT_ASSERT(file.get()!=NULL);
         CPPUNIT_ASSERT(file->numParts()==8);
         unsigned pi;
@@ -254,9 +254,9 @@ protected:
         mapping.setRepeatedCopies(7,false);
         fdesc->addCluster(grp,mapping);
         file.setown(queryDistributedFileDirectory().createNew(fdesc));
-        file->attach(DFSUTSCOPE "::testfile3");
+        file->attach(DFSUTSCOPE "::testfile3", UNKNOWN_USER);
         file.clear();
-        file.setown(dfsdir->lookup(DFSUTSCOPE "::testfile3"));
+        file.setown(dfsdir->lookup(DFSUTSCOPE "::testfile3", UNKNOWN_USER));
         CPPUNIT_ASSERT(file.get()!=NULL);
         CPPUNIT_ASSERT(file->numParts()==8);
         for (pi=0;pi<8;pi++) {
@@ -311,9 +311,9 @@ protected:
         mapping2.setRepeatedCopies(7,true);
         fdesc->addCluster(grp,mapping2);
         file.setown(queryDistributedFileDirectory().createNew(fdesc));
-        file->attach(DFSUTSCOPE "::testfile4");
+        file->attach(DFSUTSCOPE "::testfile4", UNKNOWN_USER);
         file.clear();
-        file.setown(dfsdir->lookup(DFSUTSCOPE "::testfile4"));
+        file.setown(dfsdir->lookup(DFSUTSCOPE "::testfile4", UNKNOWN_USER));
         CPPUNIT_ASSERT(file.get()!=NULL);
         CPPUNIT_ASSERT(file->numParts()==8);
         for (pi=0;pi<8;pi++) {

+ 1 - 1
dali/dfu/dfuutil.cpp

@@ -902,7 +902,7 @@ public:
         }
         if (strcmp(ftree->queryName(),queryDfsXmlBranchName(DXB_File))==0) {
             assertex(copier);
-            if (!copier->copyFile(lfn,daliep,srclfn,user,NULL))
+            if (!copier->copyFile(lfn,daliep,srclfn,user,UNKNOWN_USER))
                 throw MakeStringException(-1,"File %s could not be copied",lfn);
 
         }

+ 1 - 1
dali/sasha/saxref.cpp

@@ -1201,7 +1201,7 @@ public:
         CDfsLogicalFileName lfn;
         if (lfn.setFromMask(mask.str(),rootdir)) { // orphans are only orphans if there doesn't exist a valid file
             try {
-                if (queryDistributedFileDirectory().exists(lfn.get(),NULL,true,false)) {
+                if (queryDistributedFileDirectory().exists(lfn.get(),UNKNOWN_USER,true,false)) {
                     warn(mask.str(),"Orphans ignored as %s exists",lfn.get());
                     return;
                 }