First commit for proto test

Signed-off-by: Sarat Vemulapalli <[email protected]>
saratvemulapalli · Mar 16, 2023 · 3c506cb · 3c506cb
1 parent 497c80d
commit 3c506cb
Show file tree

Hide file tree

Showing 12 changed files with 922 additions and 20 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/gradle/run.gradle b/gradle/run.gradle
@@ -39,6 +39,7 @@ testClusters {
     testDistribution = 'archive'
     if (numZones > 1) numberOfZones = numZones
     if (numNodes > 1) numberOfNodes = numNodes
+    systemProperty 'opensearch.experimental.feature.extensions.enabled', 'true'
   }
 }
 

diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
@@ -66,7 +66,7 @@ dependencies {
   api 'com.google.api:gax:2.17.0'
   api 'org.threeten:threetenbp:1.4.4'
   api 'com.google.protobuf:protobuf-java-util:3.20.0'
-  api 'com.google.protobuf:protobuf-java:3.21.7'
+  //api 'com.google.protobuf:protobuf-java:3.21.7'
   api 'com.google.code.gson:gson:2.9.0'
   api 'com.google.api.grpc:proto-google-common-protos:2.10.0'
   api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'

diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -69,7 +69,7 @@ dependencies {
   api 'org.apache.avro:avro:1.11.1'
   api 'com.google.code.gson:gson:2.10.1'
   runtimeOnly "com.google.guava:guava:${versions.guava}"
-  api 'com.google.protobuf:protobuf-java:3.22.2'
+  //api 'com.google.protobuf:protobuf-java:3.22.2'
   api "commons-logging:commons-logging:${versions.commonslogging}"
   api 'commons-cli:commons-cli:1.5.0'
   api "commons-codec:commons-codec:${versions.commonscodec}"

diff --git a/server/build.gradle b/server/build.gradle
@@ -136,6 +136,9 @@ dependencies {
   // jna
   api "net.java.dev.jna:jna:${versions.jna}"
 
+  // protobuf
+  implementation 'com.google.protobuf:protobuf-java:3.22.2'
+
   testImplementation(project(":test:framework")) {
     // tests use the locally compiled version of server
     exclude group: 'org.opensearch', module: 'server'

diff --git a/server/src/main/java/org/opensearch/discovery/InitializeExtensionRequest.java b/server/src/main/java/org/opensearch/discovery/InitializeExtensionRequest.java
@@ -12,6 +12,7 @@
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.extensions.DiscoveryExtensionNode;
+import org.opensearch.extensions.proto.ExtensionOuterClass;
 import org.opensearch.transport.TransportRequest;
 
 import java.io.IOException;
@@ -25,23 +26,27 @@
 public class InitializeExtensionRequest extends TransportRequest {
     private final DiscoveryNode sourceNode;
     private final DiscoveryExtensionNode extension;
+    private final ExtensionOuterClass.Extension extensionProto;
 
     public InitializeExtensionRequest(DiscoveryNode sourceNode, DiscoveryExtensionNode extension) {
         this.sourceNode = sourceNode;
         this.extension = extension;
+        this.extensionProto = ExtensionOuterClass.Extension.newBuilder().setName("Sarat").setId(10).setAlias("vemsarat").build();
     }
 
     public InitializeExtensionRequest(StreamInput in) throws IOException {
         super(in);
         sourceNode = new DiscoveryNode(in);
         extension = new DiscoveryExtensionNode(in);
+        this.extensionProto = ExtensionOuterClass.Extension.parseFrom(in.readByteArray());
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         sourceNode.writeTo(out);
         extension.writeTo(out);
+        out.writeByteArray(extensionProto.toByteArray());
     }
 
     public DiscoveryNode getSourceNode() {
@@ -52,9 +57,11 @@ public DiscoveryExtensionNode getExtension() {
         return extension;
     }
 
+    public ExtensionOuterClass.Extension getExtensionProto() { return extensionProto; }
+
     @Override
     public String toString() {
-        return "InitializeExtensionsRequest{" + "sourceNode=" + sourceNode + ", extension=" + extension + '}';
+        return "InitializeExtensionsRequest{" + "sourceNode=" + sourceNode + ", extension=" + extension + extensionProto.toString() + '}';
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionRequest.java b/server/src/main/java/org/opensearch/extensions/ExtensionRequest.java
@@ -13,6 +13,7 @@
 import org.opensearch.common.Nullable;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.extensions.proto.ExtensionOuterClass;
 import org.opensearch.transport.TransportRequest;
 
 import java.io.IOException;
@@ -29,27 +30,32 @@ public class ExtensionRequest extends TransportRequest {
     private final ExtensionsManager.RequestType requestType;
     private final Optional<String> uniqueId;
 
+    private final ExtensionOuterClass.Extension extension;
+
     public ExtensionRequest(ExtensionsManager.RequestType requestType) {
         this(requestType, null);
     }
 
     public ExtensionRequest(ExtensionsManager.RequestType requestType, @Nullable String uniqueId) {
         this.requestType = requestType;
         this.uniqueId = uniqueId == null ? Optional.empty() : Optional.of(uniqueId);
+        extension = ExtensionOuterClass.Extension.newBuilder().setName("Sarat").setId(10).build();
     }
 
     public ExtensionRequest(StreamInput in) throws IOException {
         super(in);
         this.requestType = in.readEnum(ExtensionsManager.RequestType.class);
         String id = in.readOptionalString();
         this.uniqueId = id == null ? Optional.empty() : Optional.of(id);
+        this.extension = ExtensionOuterClass.Extension.parseFrom(in.readByteArray());
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeEnum(requestType);
         out.writeOptionalString(uniqueId.orElse(null));
+        out.writeByteArray(extension.toByteArray());
     }
 
     public ExtensionsManager.RequestType getRequestType() {
@@ -60,8 +66,12 @@ public Optional<String> getUniqueId() {
         return uniqueId;
     }
 
+    public void extensionToString() {
+        logger.info(extension.toString());
+    }
+
     public String toString() {
-        return "ExtensionRequest{" + "requestType=" + requestType + "uniqueId=" + uniqueId + '}';
+        return "ExtensionRequest{" + "requestType=" + requestType + "uniqueId=" + uniqueId + extension.toString() + '}';
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
@@ -48,6 +48,7 @@
 import org.opensearch.extensions.action.ExtensionActionResponse;
 import org.opensearch.extensions.action.ExtensionTransportActionsHandler;
 import org.opensearch.extensions.action.TransportActionRequestFromExtension;
+import org.opensearch.extensions.proto.ExtensionProtoHelloWorld;
 import org.opensearch.extensions.rest.RegisterRestActionsRequest;
 import org.opensearch.extensions.rest.RestActionsRequestHandler;
 import org.opensearch.extensions.settings.CustomSettingsRequestHandler;
@@ -155,6 +156,8 @@ public ExtensionsManager(Settings settings, Path extensionsPath) throws IOExcept
         this.client = null;
         this.extensionTransportActionsHandler = null;
 
+        ExtensionProtoHelloWorld protoHelloWorld = new ExtensionProtoHelloWorld();
+
         /*
          * Now Discover extensions
          */