From 9cd515746d77a9b6a4aac63c661e7940b080e1e0 Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Sun, 15 Mar 2009 17:27:48 +0000
Subject: [PATCH] - simplify index configuration and add some configuration placeholders for future use.
---
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbBackendConfiguration.xml | 35 +++++++++++++++++++++++++++++++++++
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbIndexConfiguration.xml | 10 ++++++----
opendj-sdk/opends/resource/schema/02-config.ldif | 11 ++++++-----
3 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/resource/schema/02-config.ldif b/opendj-sdk/opends/resource/schema/02-config.ldif
index 18896fa..3b02d23 100644
--- a/opendj-sdk/opends/resource/schema/02-config.ldif
+++ b/opendj-sdk/opends/resource/schema/02-config.ldif
@@ -3951,7 +3951,7 @@
NAME 'ds-cfg-qos-policy'
SUP top
STRUCTURAL
- MUST ( cn $
+ MUST ( cn $
ds-cfg-java-class)
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.185
@@ -4009,15 +4009,16 @@
ds-cfg-ndb-num-connections $
ds-cfg-deadlock-retry-limit $
ds-cfg-import-queue-size $
- ds-cfg-import-thread-count )
+ ds-cfg-import-thread-count $
+ ds-cfg-index-entry-limit )
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.197
NAME 'ds-cfg-ndb-index'
SUP top
STRUCTURAL
- MUST ( ds-cfg-attribute $
- ds-cfg-index-type )
- MAY ( ds-cfg-index-entry-limit $
+ MUST ( ds-cfg-attribute )
+ MAY ( ds-cfg-index-type $
+ ds-cfg-index-entry-limit $
ds-cfg-substring-length )
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.950
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbBackendConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbBackendConfiguration.xml
index d82893e..f08d36f 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbBackendConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbBackendConfiguration.xml
@@ -397,4 +397,39 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+ <adm:property name="index-entry-limit" advanced="true">
+ <adm:synopsis>
+ Specifies the maximum number of entries that is allowed to
+ match a given index key before that particular index key is no
+ longer maintained.
+ </adm:synopsis>
+ <adm:description>
+ This property is analogous to the ALL IDs threshold in the Sun
+ Java System Directory Server. Note that this is the default limit
+ for the backend, and it may be overridden on a per-attribute
+ basis. A value of 0 means there is no limit.
+ </adm:description>
+ <adm:requires-admin-action>
+ <adm:none>
+ <adm:synopsis>
+ If any index keys have already reached this limit, indexes
+ need to be rebuilt before they are allowed to use the
+ new limit.
+ </adm:synopsis>
+ </adm:none>
+ </adm:requires-admin-action>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>4000</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0" upper-limit="2147483647" />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-index-entry-limit</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
</adm:managed-object>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbIndexConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbIndexConfiguration.xml
index 859bf5d..55848e1 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbIndexConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NdbIndexConfiguration.xml
@@ -60,7 +60,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="index-entry-limit">
+ <adm:property name="index-entry-limit" advanced="true">
<adm:synopsis>
Specifies the maximum number of entries that are allowed
to match a given index key before that particular index key is no
@@ -97,8 +97,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="index-type" mandatory="true"
- multi-valued="true">
+ <adm:property name="index-type" multi-valued="true" advanced="true">
<adm:synopsis>
Specifies the type(s) of indexing that should be performed
for the associated attribute.
@@ -110,13 +109,16 @@
<adm:requires-admin-action>
<adm:other>
<adm:synopsis>
- If any new index types are added for an attribute, and
+ If any new index types are added for an attribute, and
values for that attribute already exist in the
database, the index must be rebuilt before it
will be accurate.
</adm:synopsis>
</adm:other>
</adm:requires-admin-action>
+ <adm:default-behavior>
+ <adm:undefined/>
+ </adm:default-behavior>
<adm:syntax>
<adm:enumeration>
<adm:value name="equality">
--
Gitblit v1.10.0