You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by GitBox <gi...@apache.org> on 2022/07/08 08:47:22 UTC
[GitHub] [unomi] sergehuber commented on a diff in pull request #458: UNOMI-626: improve migration system to prepare Unomi 2.0.0 data model
sergehuber commented on code in PR #458:
URL: https://github.com/apache/unomi/pull/458#discussion_r916590378
##########
tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/MigrationUtils.java:
##########
@@ -44,4 +49,43 @@ public static JSONObject continueQueryWithScroll(CloseableHttpClient httpClient,
public static void bulkUpdate(CloseableHttpClient httpClient, String url, String jsonData) throws IOException {
HttpUtils.executePostRequest(httpClient, url, jsonData, null);
}
+
+ public static String resourceAsString(BundleContext bundleContext, final String resource) {
+ final URL url = bundleContext.getBundle().getResource(resource);
+ try (InputStream stream = url.openStream()) {
+ return IOUtils.toString(stream, StandardCharsets.UTF_8);
+ } catch (final Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void reIndex(CloseableHttpClient httpClient, BundleContext bundleContext, String esAddress, String indexName, String newIndexSettings) throws IOException {
+ String indexNameCloned = indexName + "-cloned";
+
+ // Init requests
+ JSONObject originalIndexSettings = new JSONObject(HttpUtils.executeGetRequest(httpClient, esAddress + "/" + indexName + "/_settings", null));
+ // TODO UNOMI-606 validate following lines: (normally those properties are automatically added to unomi indices so they should always be present on the existing indices)
+ String newIndexRequest = newIndexSettings
+ .replace("#numberOfShards", originalIndexSettings.getJSONObject(indexName).getJSONObject("settings").getJSONObject("index").getString("number_of_shards"))
Review Comment:
It would be nice if we could have something more generic like #{source.settings.index.number_of_shards} in case we want to be able to copy more parameters but that might add complexity that might not be needed at this point ?
##########
tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/MigrateScript.java:
##########
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.shell.migration;
+
+import groovy.lang.Script;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Version;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class MigrateScript implements Comparable<MigrateScript> {
Review Comment:
Also could I suggest we change the name to MigrationScript?
##########
tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/MigrateScript.java:
##########
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.shell.migration;
+
+import groovy.lang.Script;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Version;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class MigrateScript implements Comparable<MigrateScript> {
Review Comment:
Could you just add a class description to explain what it represents?
##########
tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/Migration.java:
##########
@@ -19,41 +19,23 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.karaf.shell.api.console.Session;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
import java.io.IOException;
+import java.util.Map;
/**
- * This interface must be implemented if you create a new migration class
* @author dgaillard
+ * @deprecated do groovy script for implementing new migrations
Review Comment:
```suggestion
* @deprecated use Groovy scripts instead to implement new migrations
```
##########
tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/MigrationUtils.java:
##########
@@ -44,4 +49,43 @@ public static JSONObject continueQueryWithScroll(CloseableHttpClient httpClient,
public static void bulkUpdate(CloseableHttpClient httpClient, String url, String jsonData) throws IOException {
HttpUtils.executePostRequest(httpClient, url, jsonData, null);
}
+
+ public static String resourceAsString(BundleContext bundleContext, final String resource) {
+ final URL url = bundleContext.getBundle().getResource(resource);
+ try (InputStream stream = url.openStream()) {
+ return IOUtils.toString(stream, StandardCharsets.UTF_8);
+ } catch (final Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void reIndex(CloseableHttpClient httpClient, BundleContext bundleContext, String esAddress, String indexName, String newIndexSettings) throws IOException {
+ String indexNameCloned = indexName + "-cloned";
+
+ // Init requests
+ JSONObject originalIndexSettings = new JSONObject(HttpUtils.executeGetRequest(httpClient, esAddress + "/" + indexName + "/_settings", null));
+ // TODO UNOMI-606 validate following lines: (normally those properties are automatically added to unomi indices so they should always be present on the existing indices)
+ String newIndexRequest = newIndexSettings
+ .replace("#numberOfShards", originalIndexSettings.getJSONObject(indexName).getJSONObject("settings").getJSONObject("index").getString("number_of_shards"))
+ .replace("#numberOfReplicas", originalIndexSettings.getJSONObject(indexName).getJSONObject("settings").getJSONObject("index").getString("number_of_replicas"))
+ .replace("#maxDocValueFieldsSearch", originalIndexSettings.getJSONObject(indexName).getJSONObject("settings").getJSONObject("index").getString("max_docvalue_fields_search"))
+ .replace("#mappingTotalFieldsLimit", originalIndexSettings.getJSONObject(indexName).getJSONObject("settings").getJSONObject("index").getJSONObject("mapping").getJSONObject("total_fields").getString("limit"));
+ String reIndexRequest = resourceAsString(bundleContext, "requestBody/2.0.0/base_reindex_request.json")
+ .replace("#source", indexNameCloned)
+ .replace("#dest", indexName);
+ String setIndexReadOnlyRequest = resourceAsString(bundleContext, "requestBody/2.0.0/base_set_index_readonly_request.json");
+
+ // Set original index as readOnly
+ HttpUtils.executePutRequest(httpClient, esAddress + "/" + indexName + "/_settings", setIndexReadOnlyRequest, null);
Review Comment:
Maybe use a variable instead of concatenating esAddress + "/" in each line ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@unomi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org