Renamed RetentionPolicyExists to RetentionPolicyCreate.

influxdata · Nov 28, 2015 · 30cc133 · 30cc133
1 parent 8e2868e
commit 30cc133
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/influxql/ast.go b/influxql/ast.go
@@ -321,8 +321,8 @@ type CreateDatabaseStatement struct {
 	// already exists.
 	IfNotExists bool
 
-	// RetentionPolicyExists indicates whether the user explicitly wants to create a retention policy
-	RetentionPolicyExists bool
+	// RetentionPolicyCreate indicates whether the user explicitly wants to create a retention policy
+	RetentionPolicyCreate bool
 
 	// RetentionPolicyDuration indicates retention duration for the new database
 	RetentionPolicyDuration time.Duration
@@ -342,7 +342,7 @@ func (s *CreateDatabaseStatement) String() string {
 		_, _ = buf.WriteString("IF NOT EXISTS ")
 	}
 	_, _ = buf.WriteString(QuoteIdent(s.Name))
-	if s.RetentionPolicyExists {
+	if s.RetentionPolicyCreate {
 		_, _ = buf.WriteString("WITH DURATION ")
 		_, _ = buf.WriteString(s.RetentionPolicyDuration.String())
 		_, _ = buf.WriteString("REPLICATION ")

diff --git a/influxql/parser.go b/influxql/parser.go
@@ -1467,8 +1467,8 @@ func (p *Parser) parseCreateDatabaseStatement() (*CreateDatabaseStatement, error
 		// rewind
 		p.unscan()
 
-		// mark statement as having a RetentionPolicyInfo define
-		stmt.RetentionPolicyExists = true
+		// mark statement as having a RetentionPolicyInfo defined
+		stmt.RetentionPolicyCreate = true
 
 		// Look for "DURATION"
 		var rpDuration time.Duration // default is forever

diff --git a/influxql/parser_test.go b/influxql/parser_test.go
@@ -1178,23 +1178,23 @@ func TestParser_ParseStatement(t *testing.T) {
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                  "testdb",
 				IfNotExists:           false,
-				RetentionPolicyExists: false,
+				RetentionPolicyCreate: false,
 			},
 		},
 		{
 			s: `CREATE DATABASE IF NOT EXISTS testdb`,
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                  "testdb",
 				IfNotExists:           true,
-				RetentionPolicyExists: false,
+				RetentionPolicyCreate: false,
 			},
 		},
 		{
 			s: `CREATE DATABASE testdb WITH DURATION 24h`,
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                       "testdb",
 				IfNotExists:                false,
-				RetentionPolicyExists:      true,
+				RetentionPolicyCreate:      true,
 				RetentionPolicyDuration:    24 * time.Hour,
 				RetentionPolicyReplication: 1,
 				RetentionPolicyName:        "default",
@@ -1205,7 +1205,7 @@ func TestParser_ParseStatement(t *testing.T) {
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                       "testdb",
 				IfNotExists:                true,
-				RetentionPolicyExists:      true,
+				RetentionPolicyCreate:      true,
 				RetentionPolicyDuration:    24 * time.Hour,
 				RetentionPolicyReplication: 1,
 				RetentionPolicyName:        "default",
@@ -1216,7 +1216,7 @@ func TestParser_ParseStatement(t *testing.T) {
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                       "testdb",
 				IfNotExists:                false,
-				RetentionPolicyExists:      true,
+				RetentionPolicyCreate:      true,
 				RetentionPolicyDuration:    0,
 				RetentionPolicyReplication: 2,
 				RetentionPolicyName:        "default",
@@ -1227,7 +1227,7 @@ func TestParser_ParseStatement(t *testing.T) {
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                       "testdb",
 				IfNotExists:                true,
-				RetentionPolicyExists:      true,
+				RetentionPolicyCreate:      true,
 				RetentionPolicyDuration:    0,
 				RetentionPolicyReplication: 2,
 				RetentionPolicyName:        "default",
@@ -1238,7 +1238,7 @@ func TestParser_ParseStatement(t *testing.T) {
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                       "testdb",
 				IfNotExists:                false,
-				RetentionPolicyExists:      true,
+				RetentionPolicyCreate:      true,
 				RetentionPolicyDuration:    0,
 				RetentionPolicyReplication: 1,
 				RetentionPolicyName:        "test_name",
@@ -1249,7 +1249,7 @@ func TestParser_ParseStatement(t *testing.T) {
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                       "testdb",
 				IfNotExists:                true,
-				RetentionPolicyExists:      true,
+				RetentionPolicyCreate:      true,
 				RetentionPolicyDuration:    0,
 				RetentionPolicyReplication: 1,
 				RetentionPolicyName:        "test_name",
@@ -1260,7 +1260,7 @@ func TestParser_ParseStatement(t *testing.T) {
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                       "testdb",
 				IfNotExists:                false,
-				RetentionPolicyExists:      true,
+				RetentionPolicyCreate:      true,
 				RetentionPolicyDuration:    24 * time.Hour,
 				RetentionPolicyReplication: 2,
 				RetentionPolicyName:        "test_name",
@@ -1271,7 +1271,7 @@ func TestParser_ParseStatement(t *testing.T) {
 			stmt: &influxql.CreateDatabaseStatement{
 				Name:                       "testdb",
 				IfNotExists:                true,
-				RetentionPolicyExists:      true,
+				RetentionPolicyCreate:      true,
 				RetentionPolicyDuration:    24 * time.Hour,
 				RetentionPolicyReplication: 2,
 				RetentionPolicyName:        "test_name",

diff --git a/meta/statement_executor.go b/meta/statement_executor.go
@@ -112,7 +112,7 @@ func (e *StatementExecutor) ExecuteStatement(stmt influxql.Statement) *influxql.
 
 func (e *StatementExecutor) executeCreateDatabaseStatement(q *influxql.CreateDatabaseStatement) *influxql.Result {
 	var err error
-	if q.RetentionPolicyExists {
+	if q.RetentionPolicyCreate {
 		rpi := NewRetentionPolicyInfo(q.RetentionPolicyName)
 		rpi.Duration = q.RetentionPolicyDuration
 		rpi.ReplicaN = q.RetentionPolicyReplication