You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/04/27 15:16:53 UTC
airavata git commit: AIRAVATA-2246 Reorder structs by dependencies
Repository: airavata
Updated Branches:
refs/heads/develop f4c5d6766 -> b37882a43
AIRAVATA-2246 Reorder structs by dependencies
Python generated code needs to have structs defined before they are used. This
is needed to get correctly working Python 3 stubs generated by Thrift 0.10.0.
See also THRIFT-3783
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b37882a4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b37882a4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b37882a4
Branch: refs/heads/develop
Commit: b37882a4372c2fc18493737264a105162bf673b6
Parents: f4c5d67
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Jan 30 14:00:50 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Apr 27 11:15:22 2017 -0400
----------------------------------------------------------------------
.../replica_catalog_models.thrift | 31 ++++++++++----------
1 file changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b37882a4/thrift-interface-descriptions/data-models/replica-catalog-models/replica_catalog_models.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/replica-catalog-models/replica_catalog_models.thrift b/thrift-interface-descriptions/data-models/replica-catalog-models/replica_catalog_models.thrift
index b7fdff7..c039c12 100644
--- a/thrift-interface-descriptions/data-models/replica-catalog-models/replica_catalog_models.thrift
+++ b/thrift-interface-descriptions/data-models/replica-catalog-models/replica_catalog_models.thrift
@@ -39,21 +39,7 @@ enum DataProductType {
COLLECTION,
}
-struct DataProductModel {
- 1: optional string productUri,
- 2: optional string gatewayId,
- 3: optional string parentProductUri,
- 4: optional string productName,
- 5: optional string productDescription,
- 6: optional string ownerName,
- 7: optional DataProductType dataProductType,
- 8: optional i32 productSize,
- 9: optional i64 creationTime,
- 10: optional i64 lastModifiedTime,
- 11: optional map<string, string> productMetadata,
- 12: optional list<DataReplicaLocationModel> replicaLocations,
-}
-
+// THRIFT-3783 Put DataReplicaLocationModel before DataProductModel since DataProductModel references it
struct DataReplicaLocationModel {
1: optional string replicaId,
2: optional string productUri,
@@ -68,3 +54,18 @@ struct DataReplicaLocationModel {
11: optional string filePath,
12: optional map<string, string> replicaMetadata
}
+
+struct DataProductModel {
+ 1: optional string productUri,
+ 2: optional string gatewayId,
+ 3: optional string parentProductUri,
+ 4: optional string productName,
+ 5: optional string productDescription,
+ 6: optional string ownerName,
+ 7: optional DataProductType dataProductType,
+ 8: optional i32 productSize,
+ 9: optional i64 creationTime,
+ 10: optional i64 lastModifiedTime,
+ 11: optional map<string, string> productMetadata,
+ 12: optional list<DataReplicaLocationModel> replicaLocations,
+}