Merge pull request #8701 from influxdata/jw-drop-measurement

Fix drop measurement not dropping all data
influxdata · Aug 15, 2017 · a4f6771 · a4f6771
2 parents 3fb7941 + 21f6ed2
commit a4f6771
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,12 @@
 - [#8607](https://github.com/influxdata/influxdb/issues/8607): Fix time zone shifts when the shift happens on a time zone boundary.
 - [#8639](https://github.com/influxdata/influxdb/issues/8639): Parse time literals using the time zone in the select statement.
 
+## v1.3.4 [unreleased]
+
+### Bugfixes
+
+- [#8701](https://github.com/influxdata/influxdb/pull/8701): Fix drop measurement not dropping all data
+
 ## v1.3.3 [unreleased]
 
 ### Bugfixes

diff --git a/tsdb/engine/tsm1/engine.go b/tsdb/engine/tsm1/engine.go
@@ -1046,11 +1046,6 @@ func (e *Engine) deleteMeasurement(name []byte) error {
 			return err
 		}
 	}
-
-	// Remove the measurement from the index.
-	if err := e.index.DropMeasurement(name); err != nil {
-		return err
-	}
 	return nil
 }