Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2172 - update hermes json files #2173

Merged
merged 14 commits into from
Mar 22, 2023

Conversation

miroslavpojer
Copy link
Collaborator

@miroslavpojer miroslavpojer commented Feb 16, 2023

  • updated json files
  • repair of typo in menas password configuration

New hermes json files can be tested with this Hermes PR

Closes #2172

- updated json files
- repiar of typo in menas password
@miroslavpojer miroslavpojer self-assigned this Feb 16, 2023
@miroslavpojer miroslavpojer added the tests QA/test-specific label Feb 16, 2023
"spark-conf": "--conf 'spark.driver.extraJavaOptions=-Denceladus.rest.uri=http://localhost:8080/rest_api/api -Dspline.mongodb.name=spline -Dspline.mongodb.url=mongodb://127.0.0.1:27017/ -Denceladus.recordId.generation.strategy=stableHashId'",
"enceladus-job-jar": "spark-jobs/target/spark-jobs-2.19.0-SNAPSHOT.jar",
"credentials": "--rest-api-credentials-file ~/.ssh/menasCredential.properties",
"spark-conf": "--conf 'spark.driver.extraJavaOptions=-Denceladus.rest.uri=http://localhost:8080/rest_api_war/api -Dspline.mongodb.name=spline -Dspline.mongodb.url=mongodb://127.0.0.1:27017/ -Denceladus.recordId.generation.strategy=stableHashId'",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think rest-api is also in the default resource files. Shouldn't it be consistent? 🤔

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. "_war" removed from all files in commit 314a6b2.

"credentials": "--rest-api-credentials-file ~/.ssh/menasCredential.properties",
"spark-conf": "--conf 'spark.driver.extraJavaOptions=-Denceladus.rest.uri=http://localhost:8080/rest_api_war/api -Dspline.mongodb.name=spline -Dspline.mongodb.url=mongodb://127.0.0.1:27017/ -Denceladus.recordId.generation.strategy=stableHashId'",
"enceladus-job-jar": "spark-jobs/target/spark-jobs-3.0.0-SNAPSHOT.jar",
"credentials": "--rest-api-credentials-file ~/.ssh/menas-credential.properties",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change? Seems like personal setup.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to see it as small improvement to reach same pattern where CamelCase is used for Class files only. I am used to write these non-class files in format "word-word" or "word_word". I can see more similar locations with this naming. Are we following some format rules when to use CamelCase, w-w and w_w?

"enceladus-job-jar": "spark-jobs/target/spark-jobs-2.19.0-SNAPSHOT.jar",
"credentials": "--rest-api-credentials-file ~/.ssh/menasCredential.properties",
"spark-conf": "--conf 'spark.driver.extraJavaOptions=-Denceladus.rest.uri=http://localhost:8080/rest_api_war/api -Dspline.mongodb.name=spline -Dspline.mongodb.url=mongodb://127.0.0.1:27017/ -Denceladus.recordId.generation.strategy=stableHashId'",
"enceladus-job-jar": "spark-jobs/target/spark-jobs-3.0.0-SNAPSHOT.jar",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonder if this somehow could be integrated with the current version. 🤔
This way it will be behind next month.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added as point for improvement in Issue #2168

- Removed "_war" from rest_api uri definition.
benedeki
benedeki previously approved these changes Feb 23, 2023
Copy link
Collaborator

@benedeki benedeki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • code reviewed
  • pulled
  • built
  • run

@miroslavpojer miroslavpojer added PR:no testing needed Only for PR - PR doesn't need to be tested by a tester (person) and removed tests QA/test-specific labels Feb 23, 2023
- Add properties to control 'datetimeRebaseModeInRead' for tests with ancient dates.
- Removed spline configuration properties.
…files' into feature/2172-update-hermes-json-files

# Conflicts:
#	examples/data/e2e_tests/test_jsons/stdNfDnTest.json
#	examples/data/e2e_tests/test_jsons/stdNfDyTest.json
#	examples/data/e2e_tests/test_jsons/stdNtDnTest.json
#	examples/data/e2e_tests/test_jsons/stdNtDyTest.json
Zejnilovic
Zejnilovic previously approved these changes Feb 27, 2023
dk1844
dk1844 previously approved these changes Feb 28, 2023
Copy link
Contributor

@dk1844 dk1844 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@benedeki is right about the hardcoded version problem.

Otherwise LGTM (just read the code)

@@ -57,7 +57,7 @@ [email protected]
enceladus.rest.hadoop.auth.krb5.keytab=hdfs.keytab

enceladus.rest.auth.inmemory.user=user
enceladus.rest.auth.inmemory.password=chang< )eme
enceladus.rest.auth.inmemory.password=changeme
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this was a typo?
Could it have been a way to force the user of hermes to provide their own application.properties while this file serving only as an example?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. After some searching I have found answer from author about goal of this "typo". Reverted in commit 0f21273.

- Return to origin. Found record in history that it is not a typo but value for testing.
dk1844
dk1844 previously approved these changes Mar 1, 2023
Copy link
Contributor

@dk1844 dk1844 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (just read the code)

@@ -30,7 +30,7 @@
"pluginName" : "DatasetComparison",
"name": "DatasetComparison",
"order" : 1,
"args" : ["--format", "parquet", "--new-path", "#{new-std-data-path}#", "--ref-path", "#{ref-std-data-path}#", "--keys", "name" ],
"args" : ["--format", "parquet", "--new-path", "#{new-std-data-path}#", "--ref-path", "#{ref-std-data-path}#", "--keys", "property", "--datetimeRebaseMode", "LEGACY"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"args" : ["--format", "parquet", "--new-path", "#{new-std-data-path}#", "--ref-path", "#{ref-std-data-path}#", "--keys", "property", "--datetimeRebaseMode", "LEGACY"],
"args" : ["--format", "parquet", "--new-path", "#{new-std-data-path}#", "--ref-path", "#{ref-std-data-path}#", "--keys", "property"],

I think we said this is not needed anymore

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We spoke about it, but my experiments confirmed that for four std json files this settings needs to be there.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we updated Hermes to include datetimeRebaseMode?

We removed the opting afaik - AbsaOSS/hermes#132

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, I was confused. datetimeRebaseMode removed in commit 92d983d.

- Removed no more needed parameter for DatasetComparison
benedeki
benedeki previously approved these changes Mar 16, 2023
Copy link
Collaborator

@benedeki benedeki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My comments were addressed, seems the ones of others too...

dk1844
dk1844 previously approved these changes Mar 21, 2023
Copy link
Contributor

@dk1844 dk1844 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (just read the code)

@miroslavpojer miroslavpojer dismissed stale reviews from dk1844 and benedeki via 726d29a March 21, 2023 15:51
menas/ui/package.json Outdated Show resolved Hide resolved
Revert version to correct one.
@sonarcloud
Copy link

sonarcloud bot commented Mar 22, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

Copy link
Contributor

@dk1844 dk1844 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (I am sorry you had to switch Enceladus version back and forth -- not my intention indeed to complicate related setup)

@miroslavpojer miroslavpojer merged commit d2aa209 into develop Mar 22, 2023
@miroslavpojer miroslavpojer deleted the feature/2172-update-hermes-json-files branch March 22, 2023 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR:no testing needed Only for PR - PR doesn't need to be tested by a tester (person)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Hermes json test files
4 participants