Skip to content

Commit

Permalink
Merge branch 'candidate-3.10.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghalliday
ghalliday committed Jul 20, 2012
2 parents 7aa8290 + ff1f083 commit 836bea9
Show file tree
Hide file tree
Showing 67 changed files with 2,024 additions and 2,596 deletions.
32 changes: 22 additions & 10 deletions cmake_modules/FindBINUTILS.cmake
View file
Expand Up @@ -37,17 +37,29 @@ IF (NOT BINUTILS_FOUND)
if (USE_NATIVE_LIBRARIES)
FIND_PATH (BINUTILS_INCLUDE_DIR NAMES bfd.h)
FIND_LIBRARY (BINUTILS_LIBRARIES NAMES bfd)
FIND_LIBRARY (IBERTY_LIBRARIES NAMES iberty_pic)
FIND_LIBRARY (IBERTY_LIBRARIES NAMES iberty)
if ( NOT APPLE )
FIND_LIBRARY (IBERTY_LIBRARIES NAMES iberty_pic)
FIND_LIBRARY (IBERTY_LIBRARIES NAMES iberty)
endif ( NOT APPLE )
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(BinUtils DEFAULT_MSG
BINUTILS_LIBRARIES
BINUTILS_INCLUDE_DIR
IBERTY_LIBRARIES
)
IF (BINUTILS_FOUND)
set (BINUTILS_LIBRARIES ${BINUTILS_LIBRARIES} ${IBERTY_LIBRARIES} )
ENDIF()
if ( NOT APPLE )
find_package_handle_standard_args(BinUtils DEFAULT_MSG
BINUTILS_LIBRARIES
BINUTILS_INCLUDE_DIR
IBERTY_LIBRARIES
)
IF (BINUTILS_FOUND)
set (BINUTILS_LIBRARIES ${BINUTILS_LIBRARIES} ${IBERTY_LIBRARIES} )
ENDIF()
else ( NOT APPLE )
find_package_handle_standard_args(BinUtils DEFAULT_MSG
BINUTILS_LIBRARIES
BINUTILS_INCLUDE_DIR
)
IF (BINUTILS_FOUND)
set (BINUTILS_LIBRARIES ${BINUTILS_LIBRARIES} )
ENDIF()
endif ( NOT APPLE )
MARK_AS_ADVANCED(BINUTILS_INCLUDE_DIR BINUTILS_LIBRARIES)
ENDIF()
2 changes: 1 addition & 1 deletion cmake_modules/commonSetup.cmake
View file
Expand Up @@ -58,7 +58,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
else()
option(USE_LIBARCHIVE "Configure use of libarchive" ON)
endif()
option(USE_URIPARSER "Configure use of uriparser" ON)
option(USE_URIPARSER "Configure use of uriparser" OFF)
option(USE_NATIVE_LIBRARIES "Search standard OS locations for thirdparty libraries" ON)
option(USE_GIT_DESCRIBE "Use git describe to generate build tag" ON)
option(CHECK_GIT_TAG "Require git tag to match the generated build tag" OFF)
Expand Down
122 changes: 75 additions & 47 deletions common/thorhelper/thorsoapcall.cpp
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/workunit/workunit.cpp
View file
Expand Up @@ -7208,7 +7208,7 @@ void CLocalWUResult::getResultDecimal(void * val, unsigned len, unsigned precisi
const char *xmlVal = p->queryProp("xmlValue");
if (xmlVal)
{
TempDecimal d;
Decimal d;
d.setString(strlen(xmlVal), xmlVal);
if (isSigned)
d.getDecimal(len, precision, val);
Expand Down
171 changes: 63 additions & 108 deletions dali/base/dadfs.cpp
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions dali/base/dadfs.hpp
View file
Expand Up @@ -184,7 +184,7 @@ interface IDistributedFileTransaction: extends IInterface
virtual bool active()=0;
virtual bool setActive(bool on)=0; // returns old value (used internally)
virtual IDistributedFile *lookupFile(const char *lfn,unsigned timeout=INFINITE)=0;
virtual IDistributedSuperFile *lookupSuperFile(const char *slfn,bool fixmissing=false,unsigned timeout=INFINITE)=0;
virtual IDistributedSuperFile *lookupSuperFile(const char *slfn,unsigned timeout=INFINITE)=0;
virtual IUserDescriptor *queryUser()=0;
virtual bool addDelayedDelete(const char *lfn,bool remphys,IUserDescriptor *user)=0; // used internally to delay deletes untill commit
virtual void addAction(CDFAction *action)=0; // internal
Expand Down Expand Up @@ -473,7 +473,6 @@ interface IDistributedFileDirectory: extends IInterface
virtual IDistributedSuperFile *createSuperFile(const char *logicalname,bool interleaved,bool ifdoesnotexist=false,IUserDescriptor *user=NULL,IDistributedFileTransaction *transaction=NULL) = 0;
virtual IDistributedSuperFile *lookupSuperFile(const char *logicalname,IUserDescriptor *user=NULL,
IDistributedFileTransaction *transaction=NULL, // transaction only used for looking up sub files
bool fixmissing=false, // used when removing
unsigned timeout=INFINITE

) = 0; // NB lookup will also return superfiles
Expand Down
28 changes: 14 additions & 14 deletions dali/regress/daregress.cpp
View file
Expand Up @@ -680,14 +680,14 @@ static void testDFSPromote()
printf("Promote (1, -, -) - first iteration\n");
dir.promoteSuperFiles(3, sfnames, "regress::trans::sub1", delsub, createonlyone, NULL, timeout, outlinked);
{
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, timeout);
if (!sfile1.get())
ERROR("promote failed, super1 doesn't exist");
if (sfile1->numSubFiles() != 1)
ERROR("promote failed, super1 should have one subfile");
if (strcmp(sfile1->querySubFile(0).queryLogicalName(), "regress::trans::sub1") != 0)
ERROR("promote failed, wrong name for sub1");
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, timeout);
if (sfile2.get())
ERROR("promote failed, super2 does exist");
if (outlinked.length() != 0)
Expand All @@ -697,21 +697,21 @@ static void testDFSPromote()
printf("Promote (2, 1, -) - second iteration\n");
dir.promoteSuperFiles(3, sfnames, "regress::trans::sub2", delsub, createonlyone, NULL, timeout, outlinked);
{
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, timeout);
if (!sfile1.get())
ERROR("promote failed, super1 doesn't exist");
if (sfile1->numSubFiles() != 1)
ERROR("promote failed, super1 should have one subfile");
if (strcmp(sfile1->querySubFile(0).queryLogicalName(), "regress::trans::sub2") != 0)
ERROR("promote failed, wrong name for sub2");
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, timeout);
if (!sfile2.get())
ERROR("promote failed, super2 doesn't exist");
if (sfile2->numSubFiles() != 1)
ERROR("promote failed, super2 should have one subfile");
if (strcmp(sfile2->querySubFile(0).queryLogicalName(), "regress::trans::sub1") != 0)
ERROR("promote failed, wrong name for sub1");
Owned<IDistributedSuperFile> sfile3 = dir.lookupSuperFile("regress::trans::super3", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile3 = dir.lookupSuperFile("regress::trans::super3", NULL, NULL, timeout);
if (sfile3.get())
ERROR("promote failed, super3 does exist");
if (outlinked.length() != 0)
Expand All @@ -721,21 +721,21 @@ static void testDFSPromote()
printf("Promote (3, 2, 1) - third iteration\n");
dir.promoteSuperFiles(3, sfnames, "regress::trans::sub3", delsub, createonlyone, NULL, timeout, outlinked);
{
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, timeout);
if (!sfile1.get())
ERROR("promote failed, super1 doesn't exist");
if (sfile1->numSubFiles() != 1)
ERROR("promote failed, super1 should have one subfile");
if (strcmp(sfile1->querySubFile(0).queryLogicalName(), "regress::trans::sub3") != 0)
ERROR("promote failed, wrong name for sub3");
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, timeout);
if (!sfile2.get())
ERROR("promote failed, super2 doesn't exist");
if (sfile2->numSubFiles() != 1)
ERROR("promote failed, super2 should have one subfile");
if (strcmp(sfile2->querySubFile(0).queryLogicalName(), "regress::trans::sub2") != 0)
ERROR("promote failed, wrong name for sub2");
Owned<IDistributedSuperFile> sfile3 = dir.lookupSuperFile("regress::trans::super3", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile3 = dir.lookupSuperFile("regress::trans::super3", NULL, NULL, timeout);
if (!sfile3.get())
ERROR("promote failed, super3 doesn't exist");
if (sfile3->numSubFiles() != 1)
Expand All @@ -749,21 +749,21 @@ static void testDFSPromote()
printf("Promote (4, 3, 2) - fourth iteration, expect outlinked\n");
dir.promoteSuperFiles(3, sfnames, "regress::trans::sub4", delsub, createonlyone, NULL, timeout, outlinked);
{
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, timeout);
if (!sfile1.get())
ERROR("promote failed, super1 doesn't exist");
if (sfile1->numSubFiles() != 1)
ERROR("promote failed, super1 should have one subfile");
if (strcmp(sfile1->querySubFile(0).queryLogicalName(), "regress::trans::sub4") != 0)
ERROR("promote failed, wrong name for sub4");
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, timeout);
if (!sfile2.get())
ERROR("promote failed, super2 doesn't exist");
if (sfile2->numSubFiles() != 1)
ERROR("promote failed, super2 should have one subfile");
if (strcmp(sfile2->querySubFile(0).queryLogicalName(), "regress::trans::sub3") != 0)
ERROR("promote failed, wrong name for sub3");
Owned<IDistributedSuperFile> sfile3 = dir.lookupSuperFile("regress::trans::super3", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile3 = dir.lookupSuperFile("regress::trans::super3", NULL, NULL, timeout);
if (!sfile3.get())
ERROR("promote failed, super3 doesn't exist");
if (sfile3->numSubFiles() != 1)
Expand All @@ -782,7 +782,7 @@ static void testDFSPromote()
printf("Promote ([1,2], 4, 3) - fifth iteration, two in-files\n");
dir.promoteSuperFiles(3, sfnames, "regress::trans::sub1,regress::trans::sub2", delsub, createonlyone, NULL, timeout, outlinked);
{
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile1 = dir.lookupSuperFile("regress::trans::super1", NULL, NULL, timeout);
if (!sfile1.get())
ERROR("promote failed, super1 doesn't exist");
if (sfile1->numSubFiles() != 2)
Expand All @@ -791,14 +791,14 @@ static void testDFSPromote()
ERROR("promote failed, wrong name for sub1");
if (strcmp(sfile1->querySubFile(1).queryLogicalName(), "regress::trans::sub2") != 0)
ERROR("promote failed, wrong name for sub2");
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile2 = dir.lookupSuperFile("regress::trans::super2", NULL, NULL, timeout);
if (!sfile2.get())
ERROR("promote failed, super2 doesn't exist");
if (sfile2->numSubFiles() != 1)
ERROR("promote failed, super2 should have one subfile");
if (strcmp(sfile2->querySubFile(0).queryLogicalName(), "regress::trans::sub4") != 0)
ERROR("promote failed, wrong name for sub4");
Owned<IDistributedSuperFile> sfile3 = dir.lookupSuperFile("regress::trans::super3", NULL, NULL, false, timeout);
Owned<IDistributedSuperFile> sfile3 = dir.lookupSuperFile("regress::trans::super3", NULL, NULL, timeout);
if (!sfile3.get())
ERROR("promote failed, super3 doesn't exist");
if (sfile3->numSubFiles() != 1)
Expand Down
4 changes: 2 additions & 2 deletions docs/ECLProgrammersGuide/PRG_Mods/PrG_Roxie_Overview.xml
View file
Expand Up @@ -160,7 +160,7 @@ END;</programlisting>

<para>Now you're ready to publish this query to hThor.</para>

<para>2. Select "hthor" on the Target droplist</para>
<para>2. Select "hthor" on the Target drop list</para>

<para>3. Click the down arrow on the Submit button and select
Compile</para>
Expand Down Expand Up @@ -239,7 +239,7 @@ END;</programlisting>
you can inform the users that the query is available for their use.</para>

<para>The Roxie deployment process is done the same way we just did for
hThor, except the Target droplist has to be set to Roxie.</para>
hThor, except the Target drop list has to be set to Roxie.</para>

<para>Once you've deployed the query, you can test it the same way you
tested it on hThor, except the new service will appear under your Roxie in
Expand Down
11 changes: 9 additions & 2 deletions docs/HPCCClientTools/CT_Mods/CT_Comm_Line_DFU.xml
View file
Expand Up @@ -217,6 +217,13 @@
<entry>Specify a jobname for the DFU operation's
workunit.</entry>
</row>

<row>
<entry>transferbuffersize=nnn</entry>

<entry>Optional. Overrides the DFU Server's buffer size
value (default is 64k)</entry>
</row>
</tbody>
</tgroup>
</informaltable>
Expand Down Expand Up @@ -356,8 +363,8 @@ replicate=1</programlisting>
<entry><emphasis>format</emphasis></entry>

<entry>Optional. One of the following values: <emphasis
role="bold">fixed csv xml</emphasis> If omitted, the
default is fixed.</entry>
role="bold">fixed csv xml recfmv recfmb</emphasis> If
omitted, the default is fixed.</entry>
</row>

<row>
Expand Down

0 comments on commit 836bea9

Please sign in to comment.