You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by ji...@apache.org on 2025/01/16 13:15:58 UTC
(cloudberry) 15/35: Remove unused mdpart_constraint from indexes in Orca
This is an automated email from the ASF dual-hosted git repository.
jiaqizho pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 8b784b219b2a61c500cff696809c37c4ff988efa
Author: Chris Hajas <ch...@vmware.com>
AuthorDate: Mon Feb 6 10:28:24 2023 -0800
Remove unused mdpart_constraint from indexes in Orca
This was used in the previous partitioning architecture with partial
indexes, but is now unused. Also resolves a FIXME.
---
.../gpopt/translate/CTranslatorRelcacheToDXL.cpp | 9 ++--
...verlappingHeterogenousIndex-ANDPredicate-AO.mdp | 12 -----
...verlappingHeterogenousIndex-ANDPredicate-AO.mdp | 36 --------------
...OverlappingHeterogenousIndex-ORPredicate-AO.mdp | 36 --------------
...af-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp | 36 --------------
.../gporca/data/dxl/parse_tests/q26-Metadata.xml | 24 ---------
.../naucrates/dxl/parser/CParseHandlerMDIndex.h | 9 ----
.../include/naucrates/md/CMDIndexGPDB.h | 9 ----
.../libnaucrates/include/naucrates/md/IMDIndex.h | 3 --
.../gporca/libnaucrates/src/md/CMDIndexGPDB.cpp | 22 --------
.../src/parser/CParseHandlerMDIndex.cpp | 58 +---------------------
11 files changed, 5 insertions(+), 249 deletions(-)
diff --git a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
index f9cb77c903..97810ece74 100644
--- a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
@@ -1002,11 +1002,10 @@ CTranslatorRelcacheToDXL::RetrieveIndex(CMemoryPool *mp,
child_index_oids = GPOS_NEW(mp) IMdIdArray(mp);
}
- CMDIndexGPDB *index = GPOS_NEW(mp) CMDIndexGPDB(
- mp, mdid_index, mdname, index_clustered, index_partitioned, index_type,
- mdid_item_type, index_key_cols_array, included_cols, op_families_mdids,
- nullptr, // mdpart_constraint
- child_index_oids);
+ CMDIndexGPDB *index = GPOS_NEW(mp)
+ CMDIndexGPDB(mp, mdid_index, mdname, index_clustered, index_partitioned,
+ index_type, mdid_item_type, index_key_cols_array,
+ included_cols, op_families_mdids, child_index_oids);
GPOS_DELETE_ARRAY(attno_mapping);
return index;
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp
index 78b8533381..0192addf51 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp
@@ -135,18 +135,6 @@ EXPLAIN SELECT * FROM foo_1_prt_p2 WHERE c > 10 AND f > 15;
<dxl:Opfamily Mdid="0.1976.1.0"/>
<dxl:Opfamily Mdid="0.1976.1.0"/>
</dxl:Opfamilies>
- <dxl:PartConstraint DefaultPartition="" Unbounded="false">
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="11"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="20"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:PartConstraint>
</dxl:Index>
<dxl:ColumnStatistics Mdid="1.25049.1.0.5" Name="f" Width="4.000000" NullFreq="0.000000" NdvRemain="0.000000" FreqRemain="0.000000" ColStatsMissing="false">
<dxl:StatsBucket Frequency="1.000000" DistinctValues="1.000000">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp
index 2665c84fac..35d3724e11 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp
@@ -83,18 +83,6 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c < 10 AND d > 20;
<dxl:Opfamilies>
<dxl:Opfamily Mdid="0.1976.1.0"/>
</dxl:Opfamilies>
- <dxl:PartConstraint DefaultPartition="" Unbounded="false">
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="10"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:PartConstraint>
</dxl:Index>
<dxl:Type Mdid="0.23.1.0" Name="int4" IsRedistributable="true" IsHashable="true" IsMergeJoinable="true" IsComposite="false" IsFixedLength="true" Length="4" PassByValue="true">
<dxl:EqualityOp Mdid="0.96.1.0"/>
@@ -279,30 +267,6 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c < 10 AND d > 20;
<dxl:Opfamily Mdid="0.1976.1.0"/>
<dxl:Opfamily Mdid="0.1976.1.0"/>
</dxl:Opfamilies>
- <dxl:PartConstraint DefaultPartition="" Unbounded="false">
- <dxl:Or>
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="10"/>
- </dxl:Comparison>
- </dxl:And>
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="11"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="20"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:Or>
- </dxl:PartConstraint>
</dxl:Index>
<dxl:ColumnStatistics Mdid="1.29993.1.0.0" Name="a" Width="4.000000" NullFreq="0.000000" NdvRemain="0.000000" FreqRemain="0.000000" ColStatsMissing="false">
<dxl:StatsBucket Frequency="0.054937" DistinctValues="1.000000">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp
index 84d44a05cd..8e0f3e8dc0 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp
@@ -32,18 +32,6 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c > 11 OR d > 20;
<dxl:Opfamilies>
<dxl:Opfamily Mdid="0.1976.1.0"/>
</dxl:Opfamilies>
- <dxl:PartConstraint DefaultPartition="" Unbounded="false">
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="10"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:PartConstraint>
</dxl:Index>
<dxl:GPDBScalarOp Mdid="0.521.1.0" Name=">" ComparisonType="GT" ReturnsNullOnNullInput="true">
<dxl:LeftType Mdid="0.23.1.0"/>
@@ -341,30 +329,6 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c > 11 OR d > 20;
<dxl:Opfamily Mdid="0.1976.1.0"/>
<dxl:Opfamily Mdid="0.1976.1.0"/>
</dxl:Opfamilies>
- <dxl:PartConstraint DefaultPartition="" Unbounded="false">
- <dxl:Or>
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="10"/>
- </dxl:Comparison>
- </dxl:And>
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="11"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="20"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:Or>
- </dxl:PartConstraint>
</dxl:Index>
</dxl:Metadata>
<dxl:Query>
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp
index b1c1f379d7..84e00789b2 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp
@@ -116,30 +116,6 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE d < 10;
<dxl:Opfamilies>
<dxl:Opfamily Mdid="0.1976.1.0"/>
</dxl:Opfamilies>
- <dxl:PartConstraint DefaultPartition="" Unbounded="false">
- <dxl:Or>
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="10"/>
- </dxl:Comparison>
- </dxl:And>
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="11"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="20"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:Or>
- </dxl:PartConstraint>
</dxl:Index>
<dxl:ColumnStatistics Mdid="1.827775.1.0.6" Name="gp_segment_id" Width="4.000000" NullFreq="0.000000" NdvRemain="0.000000" FreqRemain="0.000000" ColStatsMissing="true"/>
<dxl:RelationStatistics Mdid="2.827775.1.0" Name="foo_1_prt_p1" Rows="0.000000" EmptyRelation="true"/>
@@ -207,18 +183,6 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE d < 10;
<dxl:Opfamilies>
<dxl:Opfamily Mdid="0.1976.1.0"/>
</dxl:Opfamilies>
- <dxl:PartConstraint DefaultPartition="" Unbounded="false">
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="10"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:PartConstraint>
</dxl:Index>
<dxl:ColumnStatistics Mdid="1.827775.1.0.1" Name="b" Width="4.000000" NullFreq="0.000000" NdvRemain="0.000000" FreqRemain="0.000000" ColStatsMissing="true"/>
<dxl:ColumnStatistics Mdid="1.827775.1.0.0" Name="a" Width="4.000000" NullFreq="0.000000" NdvRemain="0.000000" FreqRemain="0.000000" ColStatsMissing="true"/>
diff --git a/src/backend/gporca/data/dxl/parse_tests/q26-Metadata.xml b/src/backend/gporca/data/dxl/parse_tests/q26-Metadata.xml
index 87aa954be2..6a4bd2046b 100644
--- a/src/backend/gporca/data/dxl/parse_tests/q26-Metadata.xml
+++ b/src/backend/gporca/data/dxl/parse_tests/q26-Metadata.xml
@@ -127,18 +127,6 @@
<dxl:Opfamily Mdid="0.3027.1.0"/>
<dxl:Opfamily Mdid="0.3027.1.0"/>
</dxl:Opfamilies>
- <dxl:PartConstraint DefaultPartition="" Unbounded="false">
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="7" ColName="d_year" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1900"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<=" OperatorMdid="0.523.1.0">
- <dxl:Ident ColId="7" ColName="d_year" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="2100"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:PartConstraint>
</dxl:Index>
<dxl:Relation Mdid="6.1259.5.1" Name="S" IsTemporary="true" StorageType="AppendOnly, Column-oriented" DistributionPolicy="Random">
<dxl:Columns>
@@ -262,18 +250,6 @@
</dxl:CheckConstraint>
<dxl:Index Mdid="0.17027.1.0" Name="r_ind" IsClustered="false" IndexType="Bitmap" IndexItemType="0.2283.1.0" KeyColumns="0" IncludedColumns="0,1,2,3,4,5,6,7,8">
<dxl:Opfamilies/>
- <dxl:PartConstraint DefaultPartition="0" Unbounded="false">
- <dxl:And>
- <dxl:Comparison ComparisonOperator=">=" OperatorMdid="0.525.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
- </dxl:Comparison>
- <dxl:Comparison ComparisonOperator="<" OperatorMdid="0.97.1.0">
- <dxl:Ident ColId="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="3"/>
- </dxl:Comparison>
- </dxl:And>
- </dxl:PartConstraint>
</dxl:Index>
<dxl:Relation Mdid="6.378383.1.0" Name="ext_1" IsTemporary="false" StorageType="Foreign" DistributionPolicy="Random" Keys="10,4">
<dxl:Columns>
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h
index bc6c8b6e4d..7bead5f0ba 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h
@@ -59,15 +59,6 @@ private:
// included columns
ULongPtrArray *m_included_cols_array;
- // index part constraint
- CMDPartConstraintGPDB *m_part_constraint;
-
- // levels that include default partitions
- ULongPtrArray *m_level_with_default_part_array;
-
- // is constraint unbounded
- BOOL m_part_constraint_unbounded;
-
// child index oids parse handler
CParseHandlerBase *m_child_indexes_parse_handler;
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h b/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h
index 5694493968..ccdebe592d 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h
@@ -67,11 +67,6 @@ private:
// operator families for each index key
IMdIdArray *m_mdid_opfamilies_array;
- // partition constraint
- // GPDB_12_MERGE_FIXME: This field is no longer needed,
- // we should get rid of it.
- IMDPartConstraint *m_mdpart_constraint;
-
// DXL for object
const CWStringDynamic *m_dxl_str;
@@ -88,7 +83,6 @@ public:
ULongPtrArray *index_key_cols_array,
ULongPtrArray *included_cols_array,
IMdIdArray *mdid_opfamilies_array,
- IMDPartConstraint *mdpart_constraint,
IMdIdArray *child_index_oids);
// dtor
@@ -127,9 +121,6 @@ public:
// return the position of the included column
ULONG GetIncludedColPos(ULONG column) const override;
- // part constraint
- IMDPartConstraint *MDPartConstraint() const override;
-
// DXL string for index
const CWStringDynamic *
GetStrRepr() const override
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDIndex.h b/src/backend/gporca/libnaucrates/include/naucrates/md/IMDIndex.h
index 356e6fb39e..749f7f4c09 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDIndex.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/md/IMDIndex.h
@@ -82,9 +82,6 @@ public:
// return the position of the included column
virtual ULONG GetIncludedColPos(ULONG column) const = 0;
- // part constraint
- virtual IMDPartConstraint *MDPartConstraint() const = 0;
-
// type id of items returned by the index
virtual IMDId *GetIndexRetItemTypeMdid() const = 0;
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp b/src/backend/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp
index 82e9f59e5d..d46b1e61b8 100644
--- a/src/backend/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp
+++ b/src/backend/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp
@@ -18,7 +18,6 @@
#include "naucrates/dxl/xml/CXMLSerializer.h"
#include "naucrates/exception.h"
#include "naucrates/md/CMDRelationGPDB.h"
-#include "naucrates/md/IMDPartConstraint.h"
#include "naucrates/md/IMDScalarOp.h"
using namespace gpdxl;
@@ -38,7 +37,6 @@ CMDIndexGPDB::CMDIndexGPDB(CMemoryPool *mp, IMDId *mdid, CMDName *mdname,
ULongPtrArray *index_key_cols_array,
ULongPtrArray *included_cols_array,
IMdIdArray *mdid_opfamilies_array,
- IMDPartConstraint *mdpart_constraint,
IMdIdArray *child_index_oids)
: m_mp(mp),
m_mdid(mdid),
@@ -50,7 +48,6 @@ CMDIndexGPDB::CMDIndexGPDB(CMemoryPool *mp, IMDId *mdid, CMDName *mdname,
m_index_key_cols_array(index_key_cols_array),
m_included_cols_array(included_cols_array),
m_mdid_opfamilies_array(mdid_opfamilies_array),
- m_mdpart_constraint(mdpart_constraint),
m_child_index_oids(child_index_oids)
{
GPOS_ASSERT(mdid->IsValid());
@@ -89,7 +86,6 @@ CMDIndexGPDB::~CMDIndexGPDB()
m_index_key_cols_array->Release();
m_included_cols_array->Release();
m_mdid_opfamilies_array->Release();
- CRefCount::SafeRelease(m_mdpart_constraint);
CRefCount::SafeRelease(m_child_index_oids);
}
@@ -269,19 +265,6 @@ CMDIndexGPDB::GetIncludedColPos(ULONG column) const
return gpos::ulong_max;
}
-//---------------------------------------------------------------------------
-// @function:
-// CMDIndexGPDB::MDPartConstraint
-//
-// @doc:
-// Return the part constraint
-//
-//---------------------------------------------------------------------------
-IMDPartConstraint *
-CMDIndexGPDB::MDPartConstraint() const
-{
- return m_mdpart_constraint;
-}
//---------------------------------------------------------------------------
// @function:
@@ -332,11 +315,6 @@ CMDIndexGPDB::Serialize(CXMLSerializer *xml_serializer) const
CDXLTokens::GetDXLTokenStr(EdxltokenOpfamilies),
CDXLTokens::GetDXLTokenStr(EdxltokenOpfamily));
- if (nullptr != m_mdpart_constraint)
- {
- m_mdpart_constraint->Serialize(xml_serializer);
- }
-
if (IsPartitioned())
{
SerializeMDIdList(xml_serializer, m_child_index_oids,
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp
index c1ec82e6f5..be3ecc5acc 100644
--- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp
+++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp
@@ -42,9 +42,6 @@ CParseHandlerMDIndex::CParseHandlerMDIndex(
m_mdid_item_type(nullptr),
m_index_key_cols_array(nullptr),
m_included_cols_array(nullptr),
- m_part_constraint(nullptr),
- m_level_with_default_part_array(nullptr),
- m_part_constraint_unbounded(false),
m_child_indexes_parse_handler(nullptr)
{
}
@@ -63,43 +60,6 @@ CParseHandlerMDIndex::StartElement(const XMLCh *const element_uri,
const XMLCh *const element_qname,
const Attributes &attrs)
{
- if (0 == XMLString::compareString(
- CDXLTokens::XmlstrToken(EdxltokenPartConstraint),
- element_local_name))
- {
- GPOS_ASSERT(nullptr == m_part_constraint);
-
- const XMLCh *xmlszDefParts =
- attrs.getValue(CDXLTokens::XmlstrToken(EdxltokenDefaultPartition));
- if (nullptr != xmlszDefParts)
- {
- m_level_with_default_part_array =
- CDXLOperatorFactory::ExtractIntsToUlongArray(
- m_parse_handler_mgr->GetDXLMemoryManager(), xmlszDefParts,
- EdxltokenDefaultPartition, EdxltokenIndex);
- }
- else
- {
- // construct an empty keyset
- m_level_with_default_part_array =
- GPOS_NEW(m_mp) ULongPtrArray(m_mp);
- }
-
- m_part_constraint_unbounded =
- CDXLOperatorFactory::ExtractConvertAttrValueToBool(
- m_parse_handler_mgr->GetDXLMemoryManager(), attrs,
- EdxltokenPartConstraintUnbounded, EdxltokenIndex);
-
- // parse handler for part constraints
- CParseHandlerBase *pphPartConstraint =
- CParseHandlerFactory::GetParseHandler(
- m_mp, CDXLTokens::XmlstrToken(EdxltokenScalar),
- m_parse_handler_mgr, this);
- m_parse_handler_mgr->ActivateParseHandler(pphPartConstraint);
- this->Append(pphPartConstraint);
- return;
- }
-
if (0 ==
XMLString::compareString(CDXLTokens::XmlstrToken(EdxltokenPartitions),
element_local_name))
@@ -195,22 +155,6 @@ CParseHandlerMDIndex::EndElement(const XMLCh *const, // element_uri,
const XMLCh *const // element_qname
)
{
- if (0 == XMLString::compareString(
- CDXLTokens::XmlstrToken(EdxltokenPartConstraint),
- element_local_name))
- {
- GPOS_ASSERT(2 == Length());
-
- CParseHandlerScalarOp *pphPartCnstr =
- dynamic_cast<CParseHandlerScalarOp *>((*this)[1]);
- CDXLNode *pdxlnPartConstraint = pphPartCnstr->CreateDXLNode();
- pdxlnPartConstraint->AddRef();
- m_part_constraint = GPOS_NEW(m_mp) CMDPartConstraintGPDB(
- m_mp, m_level_with_default_part_array, m_part_constraint_unbounded,
- pdxlnPartConstraint);
- return;
- }
-
if (0 != XMLString::compareString(CDXLTokens::XmlstrToken(EdxltokenIndex),
element_local_name))
{
@@ -239,7 +183,7 @@ CParseHandlerMDIndex::EndElement(const XMLCh *const, // element_uri,
m_imd_obj = GPOS_NEW(m_mp) CMDIndexGPDB(
m_mp, m_mdid, m_mdname, m_clustered, is_partitioned, m_index_type,
m_mdid_item_type, m_index_key_cols_array, m_included_cols_array,
- mdid_opfamilies_array, m_part_constraint, child_indexes);
+ mdid_opfamilies_array, child_indexes);
// deactivate handler
m_parse_handler_mgr->DeactivateHandler();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org