Обсуждение: Updated Greenplum documentation

Поиск
Список
Период
Сортировка

Updated Greenplum documentation

От
Andreas 'ads' Scherbaum
Дата:
Hello,

attached patch updates the URL of the Greenplum documentation, and adds
a few more pathnames for recent versions. The URL now redirects to the
latest version.


Regards,

--
                Andreas 'ads' Scherbaum
German PostgreSQL User Group
European PostgreSQL User Group - Board of Directors
Volunteer Regional Contact, Germany - PostgreSQL Project
Вложения

Re: Updated Greenplum documentation

От
Dave Page
Дата:
Hi

On Thu, Jan 7, 2016 at 6:13 AM, Andreas 'ads' Scherbaum
<adsmail@wars-nicht.de> wrote:
>
> Hello,
>
> attached patch updates the URL of the Greenplum documentation, and adds a
> few more pathnames for recent versions. The URL now redirects to the latest
> version.

What did you create the patch against?

bf-pgadmin-osx:pgadmin3 dpage$ git apply /Volumes/VMware\ Shared\
Folders/dpage/Downloads/gp-doc.diff
/Volumes/VMware Shared Folders/dpage/Downloads/gp-doc.diff:9: trailing
whitespace.
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
/Volumes/VMware Shared Folders/dpage/Downloads/gp-doc.diff:10:
trailing whitespace.
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\bin"));
/Volumes/VMware Shared Folders/dpage/Downloads/gp-doc.diff:18:
trailing whitespace.
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\lib"));
/Volumes/VMware Shared Folders/dpage/Downloads/gp-doc.diff:19:
trailing whitespace.
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\lib"));
/Volumes/VMware Shared Folders/dpage/Downloads/gp-doc.diff:27:
trailing whitespace.
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
error: patch failed: pgadmin/pgAdmin3.cpp:1167
error: pgadmin/pgAdmin3.cpp: patch does not apply
error: patch failed: pgadmin/utils/misc.cpp:676
error: pgadmin/utils/misc.cpp: patch does not apply

--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: Updated Greenplum documentation

От
Andreas 'ads' Scherbaum
Дата:
On 07.01.2016 13:49, Dave Page wrote:
>
> What did you create the patch against?

HEAD from git.postgresql from like 2 days ago.


Regards,

--
                Andreas 'ads' Scherbaum
German PostgreSQL User Group
European PostgreSQL User Group - Board of Directors
Volunteer Regional Contact, Germany - PostgreSQL Project

Re: Updated Greenplum documentation

От
Dave Page
Дата:
On Thu, Jan 7, 2016 at 2:43 PM, Andreas 'ads' Scherbaum
<adsmail@wars-nicht.de> wrote:
> On 07.01.2016 13:49, Dave Page wrote:
>>
>>
>> What did you create the patch against?
>
>
> HEAD from git.postgresql from like 2 days ago.

Hmm, I would have expected that to work. Can you rebase it please, just in case?

--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: Updated Greenplum documentation

От
Andreas 'ads' Scherbaum
Дата:
On 07.01.2016 15:45, Dave Page wrote:
> On Thu, Jan 7, 2016 at 2:43 PM, Andreas 'ads' Scherbaum
> <adsmail@wars-nicht.de> wrote:
>> On 07.01.2016 13:49, Dave Page wrote:
>>>
>>>
>>> What did you create the patch against?
>>
>>
>> HEAD from git.postgresql from like 2 days ago.
>
> Hmm, I would have expected that to work. Can you rebase it please, just in case?
>

Just did that, and recreated the patch. Latest changes did not touch the
files I modified, the new patch has the same checksum.
Also, I can apply my patch to my working directory without any errors.

Any idea why it is failing for you? Any reject files?

--
                Andreas 'ads' Scherbaum
German PostgreSQL User Group
European PostgreSQL User Group - Board of Directors
Volunteer Regional Contact, Germany - PostgreSQL Project

Re: Updated Greenplum documentation

От
Dave Page
Дата:
On Fri, Jan 8, 2016 at 6:15 AM, Andreas 'ads' Scherbaum
<adsmail@wars-nicht.de> wrote:
> On 07.01.2016 15:45, Dave Page wrote:
>>
>> On Thu, Jan 7, 2016 at 2:43 PM, Andreas 'ads' Scherbaum
>> <adsmail@wars-nicht.de> wrote:
>>>
>>> On 07.01.2016 13:49, Dave Page wrote:
>>>>
>>>>
>>>>
>>>> What did you create the patch against?
>>>
>>>
>>>
>>> HEAD from git.postgresql from like 2 days ago.
>>
>>
>> Hmm, I would have expected that to work. Can you rebase it please, just in
>> case?
>>
>
> Just did that, and recreated the patch. Latest changes did not touch the
> files I modified, the new patch has the same checksum.
> Also, I can apply my patch to my working directory without any errors.
>
> Any idea why it is failing for you? Any reject files?

I get the following rejects (see attached as well). I wonder if it's a
line ending issue - what platform are you working on?

piranha:pgadmin3 dpage$ git apply --reject ~/Downloads/gp-doc.diff
/Users/dpage/Downloads/gp-doc.diff:9: trailing whitespace.
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
/Users/dpage/Downloads/gp-doc.diff:10: trailing whitespace.
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\bin"));
/Users/dpage/Downloads/gp-doc.diff:18: trailing whitespace.
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\lib"));
/Users/dpage/Downloads/gp-doc.diff:19: trailing whitespace.
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\lib"));
/Users/dpage/Downloads/gp-doc.diff:27: trailing whitespace.
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
Checking patch pgadmin/pgAdmin3.cpp...
error: while searching for:
// Ugly... Greenplum client releases have no predictable numbers,
because the path is the server version
if (!programFiles.IsEmpty())
{
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.3\\bin"));
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.2\\bin"));
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.1\\bin"));

error: patch failed: pgadmin/pgAdmin3.cpp:1167
error: while searching for:
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-3.3\\bin"));
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-3.2\\bin"));

path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.3\\lib"));
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.2\\lib"));
path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.1\\lib"));

error: patch failed: pgadmin/pgAdmin3.cpp:1174
error: while searching for:

if (!programFilesX86.IsEmpty())
{
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.3\\bin"));
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.2\\bin"));
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.1\\bin"));

error: patch failed: pgadmin/pgAdmin3.cpp:1184
error: while searching for:
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-3.3\\bin"));
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-3.2\\bin"));

path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.3\\lib"));
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.2\\lib"));
path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.1\\lib"));

error: patch failed: pgadmin/pgAdmin3.cpp:1191
error: while searching for:

// Generic Unix paths

path.Add(wxT("/usr/local/greenplum-clients-4.3/bin"));
path.Add(wxT("/opt/local/greenplum-clients-4.3/bin"));
path.Add(wxT("/usr/local/greenplum-clients-4.2/bin"));

error: patch failed: pgadmin/pgAdmin3.cpp:1206
error: while searching for:
path.Add(wxT("/usr/local/greenplum-clients-3.2/bin"));
path.Add(wxT("/opt/local/greenplum-clients-3.2/bin"));

path.Add(wxT("/usr/local/greenplum-clients-4.3/lib"));
path.Add(wxT("/opt/local/greenplum-clients-4.3/lib"));
path.Add(wxT("/usr/local/greenplum-clients-4.2/lib"));

error: patch failed: pgadmin/pgAdmin3.cpp:1219
error: while searching for:
if (edbHelpPath.IsEmpty())
edbHelpPath = wxT("http://www.enterprisedb.com/docs/en/current/server/");
if (gpHelpPath.IsEmpty())
gpHelpPath = wxT("http://docs.gopivotal.com/gpdb/index.html");
if (slonyHelpPath.IsEmpty())
slonyHelpPath = wxT("http://www.slony.info/documentation/");


error: patch failed: pgadmin/pgAdmin3.cpp:1664
Checking patch pgadmin/utils/misc.cpp...
error: while searching for:
       thePath.Lower().EndsWith(wxT(".zip")))
return thePath;

// In all othe cases we must have a directory
wxString sep;

// Figure out the appropriate seperator

error: patch failed: pgadmin/utils/misc.cpp:676
error: while searching for:
// the old help path (stored in the settings) is no longer working
static wxString gpHelpPath = settings->GetGpHelpPath();

if (gpHelpPath.CmpNoCase(wxT("http://www.greenplum.com/docs/3300/")) == 0)
{
gpHelpPath = wxT("http://docs.gopivotal.com/gpdb/");
// this is the old link, update the link to the new documentation link
// problem: this saves the link into the configuration file
settings->SetGpHelpPath(gpHelpPath);

error: patch failed: pgadmin/utils/misc.cpp:764
Applying patch pgadmin/pgAdmin3.cpp with 7 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Rejected hunk #4.
Rejected hunk #5.
Rejected hunk #6.
Rejected hunk #7.
Applying patch pgadmin/utils/misc.cpp with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.


--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
Вложения

Re: Updated Greenplum documentation

От
Andreas 'ads' Scherbaum
Дата:
On 08.01.2016 16:41, Dave Page wrote:
> On Fri, Jan 8, 2016 at 6:15 AM, Andreas 'ads' Scherbaum
> <adsmail@wars-nicht.de> wrote:
>> On 07.01.2016 15:45, Dave Page wrote:
>>>
>>> On Thu, Jan 7, 2016 at 2:43 PM, Andreas 'ads' Scherbaum
>>> <adsmail@wars-nicht.de> wrote:
>>>>
>>>> On 07.01.2016 13:49, Dave Page wrote:
>>>>>
>>>>>
>>>>>
>>>>> What did you create the patch against?
>>>>
>>>>
>>>>
>>>> HEAD from git.postgresql from like 2 days ago.
>>>
>>>
>>> Hmm, I would have expected that to work. Can you rebase it please, just in
>>> case?
>>>
>>
>> Just did that, and recreated the patch. Latest changes did not touch the
>> files I modified, the new patch has the same checksum.
>> Also, I can apply my patch to my working directory without any errors.
>>
>> Any idea why it is failing for you? Any reject files?
>
> I get the following rejects (see attached as well). I wonder if it's a
> line ending issue - what platform are you working on?
>

I'm on CentOS, 6 or 7 (dunno, the VM is halted right now).

--
                Andreas 'ads' Scherbaum
German PostgreSQL User Group
European PostgreSQL User Group - Board of Directors
Volunteer Regional Contact, Germany - PostgreSQL Project

Re: Updated Greenplum documentation

От
Andreas 'ads' Scherbaum
Дата:
On 08.01.2016 16:41, Dave Page wrote:
>
> I get the following rejects (see attached as well). I wonder if it's a
> line ending issue - what platform are you working on?
>
> piranha:pgadmin3 dpage$ git apply --reject ~/Downloads/gp-doc.diff
> /Users/dpage/Downloads/gp-doc.diff:9: trailing whitespace.
> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
> /Users/dpage/Downloads/gp-doc.diff:10: trailing whitespace.
> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\bin"));
> /Users/dpage/Downloads/gp-doc.diff:18: trailing whitespace.
> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\lib"));
> /Users/dpage/Downloads/gp-doc.diff:19: trailing whitespace.
> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\lib"));
> /Users/dpage/Downloads/gp-doc.diff:27: trailing whitespace.
> path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));

This complains about trailing whitespaces where I can't see any
whitespaces in my diff. Not sure why ...

Attached is an updated version of the diff, plus one with Mac line endings.


Regards,

--
                Andreas 'ads' Scherbaum
German PostgreSQL User Group
European PostgreSQL User Group - Board of Directors
Volunteer Regional Contact, Germany - PostgreSQL Project
Вложения

Re: Updated Greenplum documentation

От
Dave Page
Дата:
On Wed, Jan 13, 2016 at 11:44 PM, Andreas 'ads' Scherbaum
<adsmail@wars-nicht.de> wrote:
> On 08.01.2016 16:41, Dave Page wrote:
>>
>>
>> I get the following rejects (see attached as well). I wonder if it's a
>> line ending issue - what platform are you working on?
>>
>> piranha:pgadmin3 dpage$ git apply --reject ~/Downloads/gp-doc.diff
>> /Users/dpage/Downloads/gp-doc.diff:9: trailing whitespace.
>> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
>> /Users/dpage/Downloads/gp-doc.diff:10: trailing whitespace.
>> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\bin"));
>> /Users/dpage/Downloads/gp-doc.diff:18: trailing whitespace.
>> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\lib"));
>> /Users/dpage/Downloads/gp-doc.diff:19: trailing whitespace.
>> path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\lib"));
>> /Users/dpage/Downloads/gp-doc.diff:27: trailing whitespace.
>> path.Add(programFilesX86 +
>> wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
>
>
> This complains about trailing whitespaces where I can't see any whitespaces
> in my diff. Not sure why ...
>
> Attached is an updated version of the diff, plus one with Mac line endings.

Hmm, still wouldn't apply. I've done it manually though, along with
updates for the PG and PPAS paths.

Thanks!


--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company