Merge pull request #89 from v3io/development

Development -> Master

Author: Igor Makhlin

pkg/partmgr/partmgr.go

@@ -196,7 +196,7 @@ func (p *PartitionManager) updatePartitionInSchema(partition *DBPartition) error
 func (p *PartitionManager) PartsForRange(mint, maxt int64) []*DBPartition {
 	var parts []*DBPartition
 	for _, part := range p.partitions {
-		if part.startTime >= mint && (maxt == 0 || part.startTime < maxt) {
+		if part.InRange(mint) || part.InRange(maxt) || (mint < part.GetStartTime() && maxt > part.GetEndTime()) {
 			parts = append(parts, part)
 		}
 	}
@@ -311,7 +311,7 @@ func (p *DBPartition) TimeToChunkId(tmilli int64) (int, error) {
 	if tmilli >= p.startTime && tmilli <= p.GetEndTime() {
 		return int((tmilli-p.startTime)/p.chunkInterval) + 1, nil
 	} else {
-		return 0, errors.New("time " + string(tmilli) + " is not covered by time partition")
+		return -1, errors.Errorf("time %d is not covered by time partition", tmilli)
 	}
 }
 
@@ -320,7 +320,7 @@ func (p *DBPartition) InRange(t int64) bool {
 	if p.manager.cyclic {
 		return true
 	}
-	return t >= p.startTime && t < p.GetEndTime()
+	return t >= p.startTime && t <= p.GetEndTime()
 }
 
 // return the mint and maxt for this partition, may need maxt for cyclic partition