set indexlabel invalid if create or rebuild failed #1226
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
also check if indexlabel invalid when query by index Change-Id: If890b3bd8c441b63642a2006479cf4ccca9ddf67
Codecov Report
@@ Coverage Diff @@
## master #1226 +/- ##
============================================
- Coverage 65.76% 64.97% -0.79%
- Complexity 5752 5762 +10
============================================
Files 360 367 +7
Lines 29593 30062 +469
Branches 4180 4242 +62
============================================
+ Hits 19462 19533 +71
- Misses 8152 8548 +396
- Partials 1979 1981 +2 Continue to review full report at Codecov.
|
javeme
reviewed
Oct 27, 2020
| @@ -1349,6 +1354,13 @@ private static NoIndexException noIndexException(HugeGraph graph, | |||
| name, String.join("/", mismatched)); | |||
| } | |||
|
|
|||
| private static void validIndexLabel(IndexLabel indexLabel) { | |||
| @@ -1349,6 +1354,13 @@ private static NoIndexException noIndexException(HugeGraph graph, | |||
| name, String.join("/", mismatched)); | |||
| } | |||
|
|
|||
| private static void validIndexLabel(IndexLabel indexLabel) { | |||
| if (indexLabel.status() == SchemaStatus.INVALID) { | |||
| throw new HugeException("The label index %s is invalid", | |||
There was a problem hiding this comment.
Can't query by label index '%s' due to it is in invalid status
| @@ -158,6 +166,9 @@ private void removeIndex(Collection<Id> indexLabelIds) { | |||
| try { | |||
| locks.lockWrites(LockUtil.INDEX_LABEL_DELETE, indexLabelIds); | |||
| graphTx.removeIndex(il); | |||
| } catch (Throwable t) { | |||
| il.status(SchemaStatus.INVALID); | |||
There was a problem hiding this comment.
does save to backend store? seems need to call schemaTx.updateSchemaStatus()
| return new IndexLabel.CreatedIndexLabel(indexLabel, | ||
| rebuildTask); | ||
| } catch (Throwable t) { | ||
| indexLabel.status(SchemaStatus.INVALID); |
| rebuildTask); | ||
| } catch (Throwable t) { | ||
| indexLabel.status(SchemaStatus.INVALID); | ||
| throw t; |
Linary
previously approved these changes
Oct 27, 2020
javeme
reviewed
Oct 27, 2020
| indexLabel.status(SchemaStatus.INVALID); | ||
| throw t; | ||
| this.graph().addIndexLabel(schemaLabel, indexLabel); |
There was a problem hiding this comment.
schemaTx.updateSchemaStatus(indexLabel, SchemaStatus.INVALID);
Linary
previously approved these changes
Oct 28, 2020
javeme
reviewed
Oct 28, 2020
| @@ -231,8 +231,7 @@ private boolean hasSameProperties(IndexLabel existedIndexLabel) { | |||
| return new IndexLabel.CreatedIndexLabel(indexLabel, | |||
| rebuildTask); | |||
| } catch (Throwable e) { | |||
| indexLabel.status(SchemaStatus.INVALID); | |||
| this.graph().addIndexLabel(schemaLabel, indexLabel); | |||
| this.updateSchemaStatus(indexLabel, SchemaStatus.INVALID); | |||
There was a problem hiding this comment.
also consider removeSubIndex() at line 207
javeme
reviewed
Oct 28, 2020
| } catch (Throwable e) { | ||
| schemaTx.updateSchemaStatus(indexLabel, SchemaStatus.INVALID); | ||
| throw e; | ||
| } |
There was a problem hiding this comment.
should update status to INVALID when failure to remove vertex/edge label?
There was a problem hiding this comment.
no need. Fail to remove vertex/edge label will lead to partial delete of vertices/edges. vertex/edge label need to be still valid for remaining vertices/edges
| removeIndexLabelFromBaseLabel(schemaTx, indexLabel); | ||
| removeSchema(schemaTx, indexLabel); | ||
| // Should commit changes to backend store | ||
| // before release delete lock |
Change-Id: I7537bd5aff2b43e8a3ba26c88f83761889386ff3
houzhizhen
approved these changes
Oct 28, 2020
javeme
approved these changes
Oct 28, 2020
tmljob
pushed a commit
to tmljob/hugegraph
that referenced
this pull request
Dec 10, 2020
* set indexlabel invalid if create or rebuild failed * also check if indexlabel invalid when query by index * set vl/el to UNDELETED if fail to delete Change-Id: If890b3bd8c441b63642a2006479cf4ccca9ddf67
tmljob
pushed a commit
to tmljob/hugegraph
that referenced
this pull request
Dec 10, 2020
* set indexlabel invalid if create or rebuild failed * also check if indexlabel invalid when query by index * set vl/el to UNDELETED if fail to delete Change-Id: If890b3bd8c441b63642a2006479cf4ccca9ddf67
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
also check if indexlabel invalid when query by index
Change-Id: If890b3bd8c441b63642a2006479cf4ccca9ddf67