From: dpage Date: Thu, 8 Oct 2009 14:42:09 +0000 (+0000) Subject: Fix Greenplum support for column oriented partitions [Chuck McDevitt] X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=00caf258bd028bb69987598435dbc94b67bd6c2b;p=users%2Fquan74%2Fpgadmin-import.git Fix Greenplum support for column oriented partitions [Chuck McDevitt] git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@8065 a7884b65-44f6-0310-8a51-81a127f17b15 --- diff --git a/CHANGELOG b/CHANGELOG index 7ff6ecfe9..1087be300 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,8 @@ Changes Date Dev Ver Change details ---------- --- ------ -------------- +2009-10-08 DP 1.10.1 Fix Greenplum support for column oriented partitions + [Chuck McDevitt] 2009-10-05 DP 1.10.1 Ensure function variables get reset if the function is modified, per Dmitry Samokhin. 2009-10-01 DP 1.10.1 Fix cluster creation for Slony 2.0 [Sachin Srivastava] diff --git a/pgadmin/include/schema/pgTable.h b/pgadmin/include/schema/pgTable.h index a771ffd92..072a0f868 100644 --- a/pgadmin/include/schema/pgTable.h +++ b/pgadmin/include/schema/pgTable.h @@ -103,8 +103,8 @@ public: void iSetAppendOnly(const wxString& s) { appendOnly = s; } wxString GetCompressLevel() { return compressLevel; } void iSetCompressLevel(const wxString& s) { compressLevel = s; } - wxString GetIsColumnStore() { return columnstore; } - void iSetIsColumnStore(const wxString& s) { columnstore = s; } + wxString GetOrientation() { return orientation; } + void iSetOrientation(const wxString& s) { orientation = s; } wxString GetCompressType() { return compresstype; } void iSetCompressType(const wxString& s) { compresstype = s; }; wxString GetBlocksize() { return blocksize; } @@ -209,7 +209,7 @@ private: autovacuum_freeze_max_age, autovacuum_freeze_table_age; wxString appendOnly; wxString compressLevel; - wxString columnstore; + wxString orientation; // "row" or "column" wxString compresstype; wxString blocksize; wxString checksum; diff --git a/pgadmin/schema/gpPartition.cpp b/pgadmin/schema/gpPartition.cpp index 282e1d337..fe41db304 100644 --- a/pgadmin/schema/gpPartition.cpp +++ b/pgadmin/schema/gpPartition.cpp @@ -119,7 +119,7 @@ pgObject *gpPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser query += wxT(", gpd.localoid, gpd.attrnums \n"); query += wxT(", substring(array_to_string(reloptions, ',') from 'appendonly=([a-z]*)') AS appendonly \n"); query += wxT(", substring(array_to_string(reloptions, ',') from 'compresslevel=([0-9]*)') AS compresslevel \n"); - query += wxT(", substring(array_to_string(reloptions, ',') from 'columnstore=([a-z]*)') AS columnstore \n"); + query += wxT(", substring(array_to_string(reloptions, ',') from 'orientation=([a-z]*)') AS orientation \n"); query += wxT(", substring(array_to_string(reloptions, ',') from 'compresstype=([a-z0-9]*)') AS compresstype \n"); query += wxT(", substring(array_to_string(reloptions, ',') from 'blocksize=([0-9]*)') AS blocksize \n"); query += wxT(", substring(array_to_string(reloptions, ',') from 'checksum=([a-z]*)') AS checksum \n"); @@ -185,7 +185,7 @@ pgObject *gpPartitionFactory::CreateObjects(pgCollection *coll, ctlTree *browser table->iSetDistributionIsRandom(); table->iSetAppendOnly(tables->GetVal(wxT("appendonly"))); table->iSetCompressLevel(tables->GetVal(wxT("compresslevel"))); - table->iSetIsColumnStore(tables->GetVal(wxT("columnstore"))); + table->iSetOrientation(tables->GetVal(wxT("orientation"))); table->iSetCompressType(tables->GetVal(wxT("compresstype"))); table->iSetBlocksize(tables->GetVal(wxT("blocksize"))); table->iSetChecksum(tables->GetVal(wxT("checksum"))); diff --git a/pgadmin/schema/pgTable.cpp b/pgadmin/schema/pgTable.cpp index b8f787e13..84565d3c7 100644 --- a/pgadmin/schema/pgTable.cpp +++ b/pgadmin/schema/pgTable.cpp @@ -348,8 +348,8 @@ wxString pgTable::GetSql(ctlTree *browser) sql += wxT("APPENDONLY=") + GetAppendOnly() + wxT(", "); if (GetCompressLevel().Length() > 0) sql += wxT("COMPRESSLEVEL=") + GetCompressLevel() + wxT(", "); - if (GetIsColumnStore().Length() > 0) - sql += wxT("COLUMNSTORE=") + GetIsColumnStore() + wxT(", "); + if (GetOrientation().Length() > 0) + sql += wxT("ORIENTATION=") + GetOrientation() + wxT(", "); if (GetCompressType().Length() > 0) sql += wxT("COMPRESSTYPE=") + GetCompressType() + wxT(", "); if (GetBlocksize().Length() > 0) @@ -1227,7 +1227,7 @@ pgObject *pgTableFactory::CreateObjects(pgCollection *collection, ctlTree *brows query += wxT(", gpd.localoid, gpd.attrnums \n"); query += wxT(", substring(array_to_string(rel.reloptions, ',') from 'appendonly=([a-z]*)') AS appendonly \n"); query += wxT(", substring(array_to_string(rel.reloptions, ',') from 'compresslevel=([0-9]*)') AS compresslevel \n"); - query += wxT(", substring(array_to_string(rel.reloptions, ',') from 'columnstore=([a-z]*)') AS columnstore \n"); + query += wxT(", substring(array_to_string(rel.reloptions, ',') from 'orientation=([a-z]*)') AS orientation \n"); query += wxT(", substring(array_to_string(rel.reloptions, ',') from 'compresstype=([a-z0-9]*)') AS compresstype \n"); query += wxT(", substring(array_to_string(reloptions, ',') from 'blocksize=([0-9]*)') AS blocksize \n"); query += wxT(", substring(array_to_string(reloptions, ',') from 'checksum=([a-z]*)') AS checksum \n"); @@ -1397,7 +1397,7 @@ pgObject *pgTableFactory::CreateObjects(pgCollection *collection, ctlTree *brows table->iSetDistributionIsRandom(); table->iSetAppendOnly(tables->GetVal(wxT("appendonly"))); table->iSetCompressLevel(tables->GetVal(wxT("compresslevel"))); - table->iSetIsColumnStore(tables->GetVal(wxT("columnstore"))); + table->iSetOrientation(tables->GetVal(wxT("orientation"))); table->iSetCompressType(tables->GetVal(wxT("compresstype"))); table->iSetBlocksize(tables->GetVal(wxT("blocksize"))); table->iSetChecksum(tables->GetVal(wxT("checksum")));