Remove unused MaxNumDocsPerSegment

xichen2020 · Mar 12, 2019 · 0c9a94c · 0c9a94c
1 parent 1920f9d
commit 0c9a94c
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 27 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -77,7 +77,6 @@ database:
   namespaceFieldName: service
   timestampFieldName: "@timestamp"
   tickMinInterval: 1m
-  maxNumDocsPerSegment: 1048576
   segmentUnloadAfterUnreadFor: 5m
   persist:
     writeBufferSize: 65536

diff --git a/integration/config.go b/integration/config.go
@@ -87,7 +87,6 @@ database:
   namespaceFieldName: service
   timestampFieldName: "@timestamp"
   tickMinInterval: 1m
-  maxNumDocsPerSegment: 1048576
   segmentUnloadAfterUnreadFor: 5m
   persist:
     writeBufferSize: 65536

diff --git a/integration/raw_query_no_filter_with_orderby_from_disk_grpc_test.go b/integration/raw_query_no_filter_with_orderby_from_disk_grpc_test.go
@@ -26,8 +26,7 @@ func TestRawQueryNoFilterWithOrderByFromDiskGRPC(t *testing.T) {
 	ts.dbOpts = ts.dbOpts.
 		SetFilePathPrefix(os.TempDir()).
 		SetSegmentUnloadAfterUnreadFor(time.Second).
-		SetTickMinInterval(time.Second).
-		SetMaxNumDocsPerSegment(5)
+		SetTickMinInterval(time.Second)
 	defer ts.close(t)
 
 	// Start the server.

diff --git a/integration/raw_query_no_filter_with_orderby_from_disk_http_test.go b/integration/raw_query_no_filter_with_orderby_from_disk_http_test.go
@@ -22,8 +22,7 @@ func TestRawQueryNoFilterWithOrderByFromDiskHTTP(t *testing.T) {
 	ts.dbOpts = ts.dbOpts.
 		SetFilePathPrefix(os.TempDir()).
 		SetSegmentUnloadAfterUnreadFor(time.Second).
-		SetTickMinInterval(time.Second).
-		SetMaxNumDocsPerSegment(5)
+		SetTickMinInterval(time.Second)
 	defer ts.close(t)
 
 	// Start the server.

diff --git a/services/eventdb/config/database.go b/services/eventdb/config/database.go
@@ -27,7 +27,6 @@ type DatabaseConfiguration struct {
 	TimestampFieldName          *string                                       `yaml:"timestampFieldName"`
 	RawDocSourceFieldName       *string                                       `yaml:"rawDocSourceFieldName"`
 	TickMinInterval             *time.Duration                                `yaml:"tickMinInterval"`
-	MaxNumDocsPerSegment        *int32                                        `yaml:"maxNumDocsPerSegment"`
 	SegmentUnloadAfterUnreadFor *time.Duration                                `yaml:"segmentUnloadAfterUnreadFor"`
 	PersistManager              *persistManagerConfiguration                  `yaml:"persist"`
 	BoolArrayPool               *pool.BucketizedBoolArrayPoolConfiguration    `yaml:"boolArrayPool"`
@@ -81,9 +80,6 @@ func (c *DatabaseConfiguration) NewOptions(instrumentOpts instrument.Options) (*
 	if c.TickMinInterval != nil {
 		opts = opts.SetTickMinInterval(*c.TickMinInterval)
 	}
-	if c.MaxNumDocsPerSegment != nil {
-		opts = opts.SetMaxNumDocsPerSegment(*c.MaxNumDocsPerSegment)
-	}
 	if c.SegmentUnloadAfterUnreadFor != nil {
 		opts = opts.SetSegmentUnloadAfterUnreadFor(*c.SegmentUnloadAfterUnreadFor)
 	}

diff --git a/storage/database_test.go b/storage/database_test.go
@@ -39,8 +39,7 @@ func newTestDatabase() (*testDatabase, error) {
 	}
 
 	dbOpts := NewOptions().
-		SetNamespaceFieldName(string(testNamespace)).
-		SetMaxNumDocsPerSegment(testMaxDocsPerSegment)
+		SetNamespaceFieldName(string(testNamespace))
 
 	db := NewDatabase(namespaces, dbOpts)
 	if err := db.Open(); err != nil {

diff --git a/storage/options.go b/storage/options.go
@@ -18,7 +18,6 @@ const (
 	defaultFieldPathSeparator          = '.'
 	defaultNamespaceFieldName          = "service"
 	defaultTickMinInterval             = time.Minute
-	defaultMaxNumDocsPerSegment        = 1024 * 1024
 	defaultSegmentUnloadAfterUnreadFor = 5 * time.Minute
 )
 
@@ -41,7 +40,6 @@ type Options struct {
 	rawDocSourceFieldPath       []string
 	persistManager              persist.Manager
 	tickMinInterval             time.Duration
-	maxNumDocsPerSegment        int32
 	segmentUnloadAfterUnreadFor time.Duration
 	fieldRetriever              persist.FieldRetriever
 	queryExecutor               executor.Executor
@@ -65,7 +63,6 @@ func NewOptions() *Options {
 		rawDocSourceFieldPath:       defaultRawDocSourceFieldPath,
 		persistManager:              defaultPersistManager,
 		tickMinInterval:             defaultTickMinInterval,
-		maxNumDocsPerSegment:        defaultMaxNumDocsPerSegment,
 		segmentUnloadAfterUnreadFor: defaultSegmentUnloadAfterUnreadFor,
 		queryExecutor:               executor.NewExecutor(),
 	}
@@ -199,18 +196,6 @@ func (o *Options) TickMinInterval() time.Duration {
 	return o.tickMinInterval
 }
 
-// SetMaxNumDocsPerSegment sets the maximum number of documents per segment.
-func (o *Options) SetMaxNumDocsPerSegment(v int32) *Options {
-	opts := *o
-	opts.maxNumDocsPerSegment = v
-	return &opts
-}
-
-// MaxNumDocsPerSegment returns the maximum number of documents per segment.
-func (o *Options) MaxNumDocsPerSegment() int32 {
-	return o.maxNumDocsPerSegment
-}
-
 // SetSegmentUnloadAfterUnreadFor sets the segment unload after unread for duration.
 // If a segment is unread for longer than the configuration duration since its
 // last read access, it is eligible to be unloaded from memory.